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

Edit metadata dialog: Fix distorted rendering of some labels in the custom metadata tab in rare circumstances.

Browse Source 
Fixes #1766762 [Edit Metadata glitch has column "Read Status"  not showing properly](https://bugs.launchpad.net/calibre/+bug/1766762)

Merge branch 'master' of https://github.com/cbhaley/calibre
This commit is contained in:
Kovid Goyal 2018-06-01 17:58:35 +05:30
commit 011f8fc228
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/calibre/gui2/custom_column_widgets.py
View File

@ -676,6 +676,7 @@ def populate_metadata_page(layout, db, book_id, bulk=False, two_column=False, pa
turnover_point = count + 1000 turnover_point = count + 1000
ans = [] ans = []
column = row = base_row = max_row = 0 column = row = base_row = max_row = 0
minimum_label = 0
for key in cols: for key in cols:
if not fm[key]['is_editable']: if not fm[key]['is_editable']:
continue # this almost never happens continue # this almost never happens
@ -711,10 +712,18 @@ def populate_metadata_page(layout, db, book_id, bulk=False, two_column=False, pa
for c in range(0, len(w.widgets), 2): for c in range(0, len(w.widgets), 2):
if not is_comments: if not is_comments:
w.widgets[c].setWordWrap(True) w.widgets[c].setWordWrap(True)
if minimum_label == 0:
minimum_label = w.widgets[c].fontMetrics().boundingRect('smallLabel').width()
label_width = w.widgets[c].fontMetrics().boundingRect(w.widgets[c].text()).width()
if c == 0:
w.widgets[0].setMaximumWidth(label_width)
w.widgets[0].setSizePolicy(QSizePolicy.Maximum, QSizePolicy.Preferred)
l.setColumnMinimumWidth(0, minimum_label)
else:
w.widgets[0].setMaximumWidth(max(w.widgets[0].maximumWidth(), label_width))
w.widgets[c].setBuddy(w.widgets[c+1]) w.widgets[c].setBuddy(w.widgets[c+1])
l.addWidget(w.widgets[c], c, 0) l.addWidget(w.widgets[c], c, 0)
l.addWidget(w.widgets[c+1], c, 1) l.addWidget(w.widgets[c+1], c, 1)
l.setColumnStretch(1, 10000)
else: else:
l.addWidget(w.widgets[0], 0, 0, 1, 2) l.addWidget(w.widgets[0], 0, 0, 1, 2)
l.addItem(QSpacerItem(0, 0, vPolicy=QSizePolicy.Expanding), c, 0, 1, 1) l.addItem(QSpacerItem(0, 0, vPolicy=QSizePolicy.Expanding), c, 0, 1, 1)