mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix tableview margins

Browse source 
The previous hard-coded solution for GTK+ didn't work on HiDPI, and a
comment hinted that even on Mac OS X it might need tuning. Find a more
generic solution that should work regardless of platform and style,
based purely on the geometries reported by the style itself.

Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Giuseppe Bilotta 2014-10-19 16:15:21 +02:00 • committed by Dirk Hohndel
parent dfec501e7a
commit 58ac3b8f86
1 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
qt-ui/tableview.cpp
View file

@ -24,11 +24,31 @@ TableView::TableView(QWidget *parent) : QGroupBox(parent)
metrics.rm_col_width = metrics.icon->sz_small + 2*metrics.icon->spacing; metrics.rm_col_width = metrics.icon->sz_small + 2*metrics.icon->spacing;
metrics.header_ht = text_ht + 10; // TODO DPI metrics.header_ht = text_ht + 10; // TODO DPI
/* There`s mostly a need for a Mac fix here too. */ /* We want to get rid of the margin around the table, but
if (qApp->style()->objectName() == "gtk+") * we must be careful with some styles (e.g. GTK+) where the top
layout()->setContentsMargins(0, 9, 0, 0); * margin is actually used to hold the label. We thus check the
else * rectangles for the label and contents to make sure they do not
layout()->setContentsMargins(0, 0, 0, 0); * overlap, and adjust the top contentsMargin accordingly
*/
// start by setting all the margins at zero
QMargins margins;
// grab the label and contents dimensions and positions
QStyleOptionGroupBox option;
initStyleOption(&option);
QRect labelRect = style()->subControlRect(QStyle::CC_GroupBox, &option, QStyle::SC_GroupBoxLabel, this);
QRect contentsRect = style()->subControlRect(QStyle::CC_GroupBox, &option, QStyle::SC_GroupBoxContents, this);
/* we need to ensure that the bottom of the label is higher
* than the top of the contents */
int delta = contentsRect.top() - labelRect.bottom();
const int min_gap = metrics.icon->spacing;
if (delta <= min_gap) {
margins.setTop(min_gap - delta);
}
layout()->setContentsMargins(margins);
QIcon plusIcon(":plus"); QIcon plusIcon(":plus");
plusBtn = new QPushButton(plusIcon, QString(), this); plusBtn = new QPushButton(plusIcon, QString(), this);
plusBtn->setFlat(true); plusBtn->setFlat(true);