Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-07 18:24:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix segfault caused by calling sizeHint from within a resize event handler

Browse Source
This commit is contained in:
Kovid Goyal 2011-04-09 10:40:56 -06:00
parent 6985db62be
commit f8d4e6bfa0
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/calibre/gui2/layout.py
View File

@ -320,6 +320,7 @@ class BaseToolBar(QToolBar): # {{{
self.setOrientation(Qt.Horizontal) self.setOrientation(Qt.Horizontal)
self.setAllowedAreas(Qt.TopToolBarArea|Qt.BottomToolBarArea) self.setAllowedAreas(Qt.TopToolBarArea|Qt.BottomToolBarArea)
self.setStyleSheet('QToolButton:checked { font-weight: bold }') self.setStyleSheet('QToolButton:checked { font-weight: bold }')
self.preferred_width = self.sizeHint().width()
def resizeEvent(self, ev): def resizeEvent(self, ev):
QToolBar.resizeEvent(self, ev) QToolBar.resizeEvent(self, ev)
@ -333,7 +334,7 @@ class BaseToolBar(QToolBar): # {{{
p = gprefs['toolbar_text'] p = gprefs['toolbar_text']
if p == 'never': if p == 'never':
style = Qt.ToolButtonIconOnly style = Qt.ToolButtonIconOnly
elif p == 'auto' and self.sizeHint().width() > self.width()+35: elif p == 'auto' and self.preferred_width > self.width()+35:
style = Qt.ToolButtonIconOnly style = Qt.ToolButtonIconOnly
return style return style
@ -414,6 +415,8 @@ class ToolBar(BaseToolBar): # {{{
bar.addAction(action.qaction) bar.addAction(action.qaction)
self.added_actions.append(action.qaction) self.added_actions.append(action.qaction)
self.setup_tool_button(bar, action.qaction, action.popup_type) self.setup_tool_button(bar, action.qaction, action.popup_type)
self.preferred_width = self.sizeHint().width()
self.child_bar.preferred_width = self.child_bar.sizeHint().width()
def setup_tool_button(self, bar, ac, menu_mode=None): def setup_tool_button(self, bar, ac, menu_mode=None):
ch = bar.widgetForAction(ac) ch = bar.widgetForAction(ac)