From 963e46af99dc58c065e41faddda20c5b75d4699e Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Tue, 22 Jan 2019 02:48:52 +1100 Subject: [PATCH] made all icon sizes relative to their defaults --- panels/grapheditor.cpp | 5 ++--- ui/collapsiblewidget.cpp | 2 +- ui/keyframenavigator.cpp | 30 +++++++++--------------------- 3 files changed, 12 insertions(+), 25 deletions(-) diff --git a/panels/grapheditor.cpp b/panels/grapheditor.cpp index 5a7c39b93..7d13a905d 100644 --- a/panels/grapheditor.cpp +++ b/panels/grapheditor.cpp @@ -162,9 +162,8 @@ void GraphEditor::set_row(EffectRow *r) { slider_button->setCheckable(true); slider_button->setChecked(field->is_enabled()); slider_button->setIcon(QIcon(":/icons/record.png")); - slider_button->setProperty("field", i); - slider_button->setIconSize(QSize(8, 8)); - slider_button->setMaximumSize(QSize(12, 12)); + slider_button->setProperty("field", i); + slider_button->setIconSize(slider_button->iconSize()*0.5); connect(slider_button, SIGNAL(toggled(bool)), this, SLOT(set_field_visibility(bool))); slider_proxy_buttons.append(slider_button); value_layout->addWidget(slider_button); diff --git a/ui/collapsiblewidget.cpp b/ui/collapsiblewidget.cpp index fce861a11..324f8627d 100644 --- a/ui/collapsiblewidget.cpp +++ b/ui/collapsiblewidget.cpp @@ -31,7 +31,7 @@ CollapsibleWidget::CollapsibleWidget(QWidget* parent) : QWidget(parent) { enabled_check->setChecked(true); header = new QLabel(); collapse_button = new QPushButton(); - collapse_button->setIconSize(QSize(8, 8)); + collapse_button->setIconSize(collapse_button->iconSize()*0.5); collapse_button->setStyleSheet("QPushButton { border: none; }"); setText(tr("")); title_bar_layout->addWidget(collapse_button); diff --git a/ui/keyframenavigator.cpp b/ui/keyframenavigator.cpp index 8115ed42f..228314d4c 100644 --- a/ui/keyframenavigator.cpp +++ b/ui/keyframenavigator.cpp @@ -6,52 +6,40 @@ #include KeyframeNavigator::KeyframeNavigator(QWidget *parent) : QWidget(parent) { - int icon_size_val = 8*QApplication::desktop()->devicePixelRatio(); - int clock_size_val = 12*QApplication::desktop()->devicePixelRatio(); - int button_size_val = 20*QApplication::desktop()->devicePixelRatio(); - - QSize icon_size(icon_size_val, icon_size_val); - QSize clock_size(clock_size_val, clock_size_val); - QSize button_size(button_size_val, button_size_val); - key_controls = new QHBoxLayout(); key_controls->setSpacing(0); key_controls->setMargin(0); - //key_controls->addStretch(); + key_controls->addStretch(); setLayout(key_controls); left_key_nav = new QPushButton(); - left_key_nav->setIcon(QIcon(":/icons/tri-left.png")); - left_key_nav->setMaximumSize(button_size); - left_key_nav->setIconSize(icon_size); + left_key_nav->setIcon(QIcon(":/icons/tri-left.png")); + left_key_nav->setIconSize(left_key_nav->iconSize()*0.5); left_key_nav->setVisible(false); key_controls->addWidget(left_key_nav); connect(left_key_nav, SIGNAL(clicked(bool)), this, SIGNAL(goto_previous_key())); connect(left_key_nav, SIGNAL(clicked(bool)), this, SIGNAL(clicked())); key_addremove = new QPushButton(); - key_addremove->setIcon(QIcon(":/icons/diamond.png")); - key_addremove->setMaximumSize(button_size); - key_addremove->setIconSize(QSize(8, 8)); + key_addremove->setIcon(QIcon(":/icons/diamond.png")); + key_addremove->setIconSize(key_addremove->iconSize()*0.5); key_addremove->setVisible(false); key_controls->addWidget(key_addremove); connect(key_addremove, SIGNAL(clicked(bool)), this, SIGNAL(toggle_key())); connect(key_addremove, SIGNAL(clicked(bool)), this, SIGNAL(clicked())); right_key_nav = new QPushButton(); - right_key_nav->setIcon(QIcon(":/icons/tri-right.png")); - right_key_nav->setMaximumSize(button_size); - right_key_nav->setIconSize(icon_size); + right_key_nav->setIcon(QIcon(":/icons/tri-right.png")); + right_key_nav->setIconSize(right_key_nav->iconSize()*0.5); right_key_nav->setVisible(false); key_controls->addWidget(right_key_nav); connect(right_key_nav, SIGNAL(clicked(bool)), this, SIGNAL(goto_next_key())); connect(right_key_nav, SIGNAL(clicked(bool)), this, SIGNAL(clicked())); keyframe_enable = new QPushButton(QIcon(":/icons/clock.png"), ""); - keyframe_enable->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed); - keyframe_enable->setMaximumSize(button_size); - keyframe_enable->setIconSize(clock_size); + keyframe_enable->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed); + keyframe_enable->setIconSize(keyframe_enable->iconSize()*0.75); keyframe_enable->setCheckable(true); keyframe_enable->setToolTip(tr("Enable Keyframes")); connect(keyframe_enable, SIGNAL(clicked(bool)), this, SIGNAL(keyframe_enabled_changed(bool)));