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

DRYer

Browse Source
This commit is contained in:
Kovid Goyal 2021-11-13 15:24:45 +05:30
parent 6ca398619b
commit 98c4b99d73
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/calibre/gui2/flow_toolbar.py
View File

@ -144,6 +144,13 @@ class FlowToolBar(QWidget):
for item in self.items: for item in self.items:
if isinstance(item, Separator): if isinstance(item, Separator):
item.setGeometry(0, 0, 0, 0) item.setGeometry(0, 0, 0, 0)
def commit_line():
while current_line and isinstance(current_line[-1], Separator):
current_line.pop()
if current_line:
lines.append((line_height, current_line))
for wid in self.items: for wid in self.items:
if not wid.isVisible() or (not current_line and isinstance(wid, Separator)): if not wid.isVisible() or (not current_line and isinstance(wid, Separator)):
continue continue
@ -157,9 +164,7 @@ class FlowToolBar(QWidget):
x = rect.x() x = rect.x()
y = y + line_height + vs y = y + line_height + vs
next_x = x + isz.width() + hs next_x = x + isz.width() + hs
while current_line and isinstance(current_line[-1], Separator): commit_line()
current_line.pop()
lines.append((line_height, current_line))
current_line = [] current_line = []
line_height = 0 line_height = 0
if apply_geometry: if apply_geometry:
@ -168,7 +173,7 @@ class FlowToolBar(QWidget):
line_height = max(line_height, isz.height()) line_height = max(line_height, isz.height())
current_line.append(wid) current_line.append(wid)
lines.append((line_height, current_line)) commit_line()
if apply_geometry: if apply_geometry:
self.applied_geometry = rect self.applied_geometry = rect