button padding fix

Author: sulincix

src/tools.h

@@ -15,9 +15,10 @@
 #define BGDIR "/usr/share/pardus/pardus-pen/backgrounds"
 #endif
 
-#define butsize 48*scale
 #define padding 8*scale
 
+#define butsize (48*scale + padding)
+
 #define MAX(x, y) (((x) > (y)) ? (x) : (y))
 #define MIN(x, y) (((x) < (y)) ? (x) : (y))
 

src/tools/mainWindow.cpp

@@ -157,8 +157,6 @@ void setupTools(){
         tool->setAttribute(Qt::WA_NoSystemBackground, true);
         tool->setStyleSheet(
             "background: none;"
-            "color: black;"
-            "font-size: "+QString::number(18*scale)+"px;"
         );
 
         // second toolbar
@@ -173,8 +171,6 @@ void setupTools(){
         tool2->setAttribute(Qt::WA_NoSystemBackground, true);
         tool2->setStyleSheet(
             "background: none;"
-            "color: black;"
-            "font-size: "+QString::number(18*scale)+"px;"
         );
         floatingSettings = new FloatingSettings(tool2);
         floatingWidget = new FloatingWidget(tool);

src/widgets/Button.cpp

@@ -23,10 +23,9 @@ QPushButton* create_button_text(const char* name, ButtonEvent event) {
         };
         QObject::connect(button, &QPushButton::clicked, events[button]);
     }
-    QFont font = button->font();
-    font.setPointSize(18*scale);
-    button->setFont(font);
-    button->setStyleSheet(QString("background-color: none;"));
+    button->setStyleSheet(
+        "background-color: none;"
+    );
 
     return button;
 }
@@ -40,10 +39,7 @@ QPushButton* create_button(int id, ButtonEvent event) {
         QObject::connect(button, &QPushButton::clicked, events[button]);
     }
     set_icon(get_icon_by_id(id), button);
-    QFont font = button->font();
-    font.setPointSize(18*scale);
     button->setFixedSize(butsize, butsize);
-    button->setFont(font);
     button->setStyleSheet(QString("background-color: none;"));
     return button;
 }
@@ -113,15 +109,15 @@ void set_icon(const char* name, QPushButton * button) {
     QIcon icon = QIcon(name);
     QPixmap pixmap = icon.pixmap(QSize(butsize, butsize));
     button->setIcon(icon);
-    button->setIconSize(QSize(butsize, butsize));
+    button->setIconSize(QSize(butsize - padding, butsize - padding));
     button->setFlat(true);
 }
 
 void set_icon_combined(const char* name, const char* subname, QPushButton * button){
     QIcon icon = combineIcons(QIcon(name), QIcon(subname));
     QPixmap pixmap = icon.pixmap(QSize(butsize, butsize));
     button->setIcon(icon);
-    button->setIconSize(QSize(butsize, butsize));
+    button->setIconSize(QSize(butsize - padding, butsize - padding));
     button->setFlat(true);
 }
 

src/widgets/FloatingSettings.cpp

@@ -35,7 +35,7 @@ FloatingSettings::FloatingSettings(QWidget *parent) : QWidget(parent) {
         "QWidget {"
         "border-radius: "+QString::number(13*scale)+"px;"
         "color: #000000;"
-        "font: "+QString::number(18*scale)+"px;"
+        "font-size: "+QString::number(22*scale)+"px;"
 //        "background-color: #f3232323;"
         "background: none;"
         "}"