summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlessandro Portale <alessandro.portale@theqtcompany.com>2016-04-02 23:56:36 +0200
committerAlessandro Portale <alessandro.portale@theqtcompany.com>2016-05-31 08:49:03 +0000
commit42228d719c8222088058b6b8404865c5d45e0149 (patch)
tree3ef7861b07076f9f37e7eded430622ce73db500e
parent588008a3c22007bf5e21b22a702df833f3ae957b (diff)
downloadqttools-42228d719c8222088058b6b8404865c5d45e0149.tar.gz
Designer: Fix the toolbar dimensions of the QtRescourceView
The filter lineedit sits in a layout which has default contentmargins, also no toolbar icon size is set. Thich change sets the contentmargins to 0, and the icon size to 22 (like in other parts of Designer). the toolbar now looks good in Designer, as-well in Qt Creator. Change-Id: Ie722ff851fd9fecb36c9deba3662632fedf0080d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
-rw-r--r--src/designer/src/lib/shared/qtresourceview.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/designer/src/lib/shared/qtresourceview.cpp b/src/designer/src/lib/shared/qtresourceview.cpp
index af1d42cd4..5044a77d3 100644
--- a/src/designer/src/lib/shared/qtresourceview.cpp
+++ b/src/designer/src/lib/shared/qtresourceview.cpp
@@ -194,6 +194,7 @@ QtResourceViewPrivate::QtResourceViewPrivate(QDesignerFormEditorInterface *core)
m_ignoreGuiSignals(false),
m_resourceEditingEnabled(true)
{
+ m_toolBar->setIconSize(QSize(22, 22));
}
void QtResourceViewPrivate::restoreSettings()
@@ -603,6 +604,7 @@ QtResourceView::QtResourceView(QDesignerFormEditorInterface *core, QWidget *pare
d_ptr->m_filterWidget = new QWidget(d_ptr->m_toolBar);
QHBoxLayout *filterLayout = new QHBoxLayout(d_ptr->m_filterWidget);
+ filterLayout->setContentsMargins(0, 0, 0, 0);
QLineEdit *filterLineEdit = new QLineEdit(d_ptr->m_filterWidget);
connect(filterLineEdit, SIGNAL(textChanged(QString)), this, SLOT(slotFilterChanged(QString)));
filterLineEdit->setPlaceholderText(tr("Filter"));