Merge pull request #48 from eekkelund/iconSizeLauncher

[Controls] Add Theme.iconLauncherSize

src/controls/sizing.cpp

@@ -22,6 +22,30 @@ Sizing::Sizing(QObject *parent) : QObject(parent)
 
     m_dpi = screen->physicalDotsPerInch();
 
+    int largerSide;
+
+     qDebug() << "Height: " << m_height << "Width: " << m_width;
+
+     if(m_height > m_width) {
+         largerSide = m_width;
+     } else {
+         largerSide = m_height;
+     }
+      
+     if(largerSide > 2160){
+         //>2160
+         m_launcher_icon_size = 256;
+     }else if (largerSide > 1080){
+         //1081-2160
+         m_launcher_icon_size = 128;
+     }else if(largerSide > 720){
+         //721-1080
+         m_launcher_icon_size = 108;
+     }else {
+         //>720
+        m_launcher_icon_size = 86;
+     }
+
     qDebug() << "DPI is " << m_dpi;
 
     if(m_dpi < 140){

src/controls/sizing.h

@@ -32,6 +32,8 @@ public:
     float getMmScaleFactor(){return m_mm_factor;}
     float getDpScaleFactor(){return m_dp_factor;}
 
+    int getLauncherIconSize(){return m_launcher_icon_size;}
+
     Densitie getDensitie();
 
     Q_INVOKABLE float mm(float value);
@@ -49,6 +51,8 @@ private:
     int m_width;
     int m_height;
 
+    int m_launcher_icon_size;
+
     float m_mm_factor;
     float m_dp_factor;
 

src/controls/theme.cpp

@@ -10,6 +10,7 @@ Theme::Theme(QObject *parent) : QObject(parent)
 {
     Sizing *size = new Sizing;
     m_dp = size->getDpScaleFactor();
+    m_iconSizeLauncher = size->getLauncherIconSize();
     //Load defaults
     m_itemWidthLarge = 320*m_dp;
     m_itemWidthMedium = 240*m_dp;
@@ -67,6 +68,14 @@ bool Theme::loadTheme(QString fileName)
     QJsonDocument t = QJsonDocument::fromJson(themeJsonString.toUtf8());
     QJsonObject theme = t.object();
 
+    if(theme.value("iconSizeLauncher").toString().toFloat() != 0 &&
+            theme.value("iconSizeLauncher").toString().toFloat() != m_iconSizeLauncher)
+    {
+        m_iconSizeLauncher = theme.value("iconSizeLauncher").toString().toFloat();
+        emit iconSizeLauncherChanged();
+        updated = true;
+    }
+
     if(theme.value("itemWidthLarge").toString().toFloat() != 0 &&
             theme.value("itemWidthLarge").toString().toFloat() != m_itemWidthLarge)
     {

src/controls/theme.h

@@ -7,6 +7,8 @@ class Theme : public QObject
 {
     Q_OBJECT
 
+    Q_PROPERTY(qreal iconSizeLauncher READ iconSizeLauncher NOTIFY iconSizeLauncherChanged)
+
     Q_PROPERTY(qreal itemWidthLarge READ itemWidthLarge NOTIFY itemWidthLargeChanged)
     Q_PROPERTY(qreal itemWidthMedium READ itemWidthMedium NOTIFY itemWidthMediumChanged)
     Q_PROPERTY(qreal itemWidthSmall READ itemWidthSmall NOTIFY itemWidthSmallChanged)
@@ -81,6 +83,8 @@ public:
     QString backgroundColor(){return m_backgroundColor;}
     QString backgroundAccentColor(){return m_backgroundAccentColor;}
 
+    qreal iconSizeLauncher() {return m_iconSizeLauncher;}
+
 signals:
     void themeUpdate();
 
@@ -118,9 +122,13 @@ signals:
     void backgroundColorChanged();
     void backgroundAccentColorChanged();
 
+    void iconSizeLauncherChanged();
+
 public slots:
 
 private:
+    qreal m_iconSizeLauncher;   //86 or 108 or 128 or 256
+    
     qreal m_itemWidthLarge;        //320
     qreal m_itemWidthMedium;       //240
     qreal m_itemWidthSmall;        //120