- reduced threshold for 'separate blank button' (bug #1164925)

bzr-revno: 2228
Fixes: https://launchpad.net/bugs/1164925
This commit is contained in:
Andreas Preikschat 2013-04-06 09:31:33 +02:00
commit 7133c0ef0b

View File

@ -44,6 +44,8 @@ from openlp.core.utils.actions import ActionList, CategoryOrder
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
# Threshold which has to be trespassed to toggle.
HIDE_MENU_THRESHOLD = 27
AUDIO_TIME_LABEL_STYLESHEET = u'background-color: palette(background); ' \ AUDIO_TIME_LABEL_STYLESHEET = u'background-color: palette(background); ' \
u'border-top-color: palette(shadow); ' \ u'border-top-color: palette(shadow); ' \
u'border-left-color: palette(shadow); ' \ u'border-left-color: palette(shadow); ' \
@ -588,12 +590,12 @@ class SlideController(DisplayController):
if self.is_live: if self.is_live:
# Space used by the toolbar. # Space used by the toolbar.
used_space = self.toolbar.size().width() + self.hide_menu.size().width() used_space = self.toolbar.size().width() + self.hide_menu.size().width()
# The + 40 is needed to prevent flickering. This can be considered a "buffer". # Add the threshold to prevent flickering.
if width > used_space + 40 and self.hide_menu.isVisible(): if width > used_space + HIDE_MENU_THRESHOLD and self.hide_menu.isVisible():
self.toolbar.set_widget_visible(self.narrow_menu, False) self.toolbar.set_widget_visible(self.narrow_menu, False)
self.toolbar.set_widget_visible(self.wide_menu) self.toolbar.set_widget_visible(self.wide_menu)
# The - 40 is needed to prevent flickering. This can be considered a "buffer". # Take away a threshold to prevent flickering.
elif width < used_space - 40 and not self.hide_menu.isVisible(): elif width < used_space - HIDE_MENU_THRESHOLD and not self.hide_menu.isVisible():
self.toolbar.set_widget_visible(self.wide_menu, False) self.toolbar.set_widget_visible(self.wide_menu, False)
self.toolbar.set_widget_visible(self.narrow_menu) self.toolbar.set_widget_visible(self.narrow_menu)