Author: kitone
Date: Mon Jan 5 20:51:26 2015
New Revision: 880
URL: http://svn.gna.org/viewcvs/subtitleeditor?rev=880&view=rev
Log:
Fix bug #22482 : Another regression of gtk3 port (waveform issue).
Modified:
trunk/ChangeLog
trunk/src/we/waveformeditor.cc
Modified: trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/subtitleeditor/trunk/ChangeLog?rev=880&r1=879&r2=880&view=diff
==============================================================================
--- trunk/ChangeLog (original)
+++ trunk/ChangeLog Mon Jan 5 20:51:26 2015
@@ -1,3 +1,8 @@
+2015-01-05 kitone <[email protected]>
+
+ * src/we/waveformeditor.cc:
+ Fix bug #22482 : Another regression of gtk3 port (waveform issue).
+
2015-01-05 kitone <[email protected]>
* src/gui/spinbuttontime.cc:
Modified: trunk/src/we/waveformeditor.cc
URL:
http://svn.gna.org/viewcvs/subtitleeditor/trunk/src/we/waveformeditor.cc?rev=880&r1=879&r2=880&view=diff
==============================================================================
--- trunk/src/we/waveformeditor.cc (original)
+++ trunk/src/we/waveformeditor.cc Mon Jan 5 20:51:26 2015
@@ -524,7 +524,12 @@
m_waveform = wf;
- Config::getInstance().set_value_bool("waveform", "display", (bool)wf);
+ // Only show the wf view if it's not already visible
+ // Don't show or hide using the wf status
+ // bug #22482 : Another regression of gtk3 port
+ Config &cfg = Config::getInstance();
+ if(cfg.get_value_bool("waveform", "display") == false && wf)
+ cfg.set_value_bool("waveform", "display", true);
if(has_renderer())
renderer()->set_waveform(wf);
@@ -1168,12 +1173,7 @@
// m_cfg_respect_gab_between_subtitles =
utility::string_to_bool(value);
else if(key == "display")
{
- bool state = utility::string_to_bool(value);
-
- if(state)
- show();
- else
- hide();
+ utility::string_to_bool(value) ? show() : hide();
}
else if(key == "renderer")
{
_______________________________________________
Subtitleeditor-commits mailing list
[email protected]
https://mail.gna.org/listinfo/subtitleeditor-commits
