Fixes Razor-qt#646 changing task bar button default width from 400px …

…to 300px
kuzmas · Feb 9, 2014 · 455ac6a · 455ac6a
1 parent 361a4ae
commit 455ac6a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/razorqt-panel/plugin-taskbar/razortaskbar.cpp b/razorqt-panel/plugin-taskbar/razortaskbar.cpp
@@ -289,7 +289,7 @@ void RazorTaskBar::setButtonStyle(Qt::ToolButtonStyle buttonStyle)
  ************************************************/
 void RazorTaskBar::settingsChanged()
 {
-    mButtonWidth = mPlugin->settings()->value("buttonWidth", 400).toInt();
+    mButtonWidth = mPlugin->settings()->value("buttonWidth", RazorTaskbarConfiguration::defaultButtonWidth()).toInt();
     QString s = mPlugin->settings()->value("buttonStyle").toString().toUpper();
 
     if (s == "ICON")

diff --git a/razorqt-panel/plugin-taskbar/razortaskbarconfiguration.cpp b/razorqt-panel/plugin-taskbar/razortaskbarconfiguration.cpp
@@ -76,7 +76,7 @@ void RazorTaskbarConfiguration::loadSettings()
     updateControls(ui->buttonStyleCB->currentIndex());
 
     /* Keep buttonWidth loading at the end of this method to prevent errors */
-    ui->buttonWidthSB->setValue(mSettings.value("buttonWidth", 400).toInt());
+    ui->buttonWidthSB->setValue(mSettings.value("buttonWidth", defaultButtonWidth()).toInt());
 }
 
 void RazorTaskbarConfiguration::saveSettings()

diff --git a/razorqt-panel/plugin-taskbar/razortaskbarconfiguration.h b/razorqt-panel/plugin-taskbar/razortaskbarconfiguration.h
@@ -45,6 +45,8 @@ class RazorTaskbarConfiguration : public QDialog
     explicit RazorTaskbarConfiguration(QSettings &settings, QWidget *parent = 0);
     ~RazorTaskbarConfiguration();
 
+    static int defaultButtonWidth() { return 300; }
+
 private:
     Ui::RazorTaskbarConfiguration *ui;
     QSettings &mSettings;