Changeset 552b81e82416…
Parent 59cfbe9c6f16…
by
Changes to one file · Browse files at 552b81e82416 Showing diff from parent 59cfbe9c6f16 Diff from another changeset...
@@ -466,7 +466,8 @@ settings['glog-vpane'] = self.vpaned.get_position()
settings['glog-hpane'] = self.hpaned.get_position()
if hasattr(self, 'mqpaned'):
- settings['glog-mqpane'] = self.mqpaned.get_position()
+ curpos = self.mqpaned.get_position()
+ settings['glog-mqpane'] = curpos or self.setting_mqhpos
settings['branch-color'] = self.graphview.get_property('branch-color')
settings['show-filterbar'] = self.show_filterbar
settings['show-syncbar'] = self.show_syncbar
@@ -484,7 +485,7 @@ gdialog.GDialog.load_settings(self, settings)
self.setting_vpos = settings.get('glog-vpane', -1)
self.setting_hpos = settings.get('glog-hpane', -1)
- self.setting_mqhpos = settings.get('glog-mqpane', 140)
+ self.setting_mqhpos = settings.get('glog-mqpane', 140) or 140
self.branch_color = settings.get('branch-color', False)
self.show_filterbar = settings.get('show-filterbar', True)
self.show_syncbar = settings.get('show-syncbar', True)
@@ -1210,7 +1211,7 @@ def realize_settings(self):
self.vpaned.set_position(self.setting_vpos)
self.hpaned.set_position(self.setting_hpos)
- if hasattr(self, 'mqpaned'):
+ if hasattr(self, 'mqpaned') and self.mqtb.get_active():
self.mqpaned.set_position(self.setting_mqhpos)
def thgdiff(self, treeview):
@@ -1652,7 +1653,7 @@ enable = self.mqwidget.has_patch()
oldpos = self.mqpaned.get_position()
self.mqpaned.set_position(enable and self.setting_mqhpos or 0)
- if not enable:
+ if not enable and oldpos:
self.setting_mqhpos = oldpos
# set the state of MQ toolbutton
|
Loading...