Blame SOURCES/kde-workspace-revert-improve-systemtray-on-hdpi-displays.patch

b5cc75
diff --git a/plasma/generic/applets/systemtray/package/contents/ui/IconsList.qml b/plasma/generic/applets/systemtray/package/contents/ui/IconsList.qml
b5cc75
index d72733c..7ec7346 100644
b5cc75
--- a/plasma/generic/applets/systemtray/package/contents/ui/IconsList.qml
b5cc75
+++ b/plasma/generic/applets/systemtray/package/contents/ui/IconsList.qml
b5cc75
@@ -33,7 +33,7 @@ MouseArea {
b5cc75
     id: root_item
b5cc75
 
b5cc75
     property int icons_size:     24  ///< Size of icons, icons are square i.e. width == height
b5cc75
-    property int icons_margins:  icons_size/6  ///< Margins for icons
b5cc75
+    property int icons_margins:  4  ///< Margins for icons
b5cc75
     property alias icons_number: repeater.count  ///< [readonly] Number of icons
b5cc75
     property alias model:    repeater.model; ///< Model for grid
b5cc75
     property int cell_size: icons_size + 2*icons_margins ///< [readonly] size of grid cell
b5cc75
diff --git a/plasma/generic/applets/systemtray/package/contents/ui/main.qml b/plasma/generic/applets/systemtray/package/contents/ui/main.qml
b5cc75
index 209091b..8577362 100644
b5cc75
--- a/plasma/generic/applets/systemtray/package/contents/ui/main.qml
b5cc75
+++ b/plasma/generic/applets/systemtray/package/contents/ui/main.qml
b5cc75
@@ -34,7 +34,7 @@ Item {
b5cc75
     property int minimumWidth:  JS.MINIMUM_SIZE
b5cc75
     property int minimumHeight: JS.MINIMUM_SIZE
b5cc75
 
b5cc75
-    property int iconSize: Math.min(root_item.width, Math.min(root_item.height, theme.defaultFont.mSize.height < 20 ? 24 : theme.largeIconSize)) //Math.min(root_item.width, Math.min(root_item.height, JS.ICONS_SIZE))
b5cc75
+    property int iconSize: Math.min(root_item.width, Math.min(root_item.height, JS.ICONS_SIZE))
b5cc75
 
b5cc75
     // Data Models
b5cc75
     property list<ListModel> models: [
b5cc75
@@ -112,7 +112,7 @@ Item {
b5cc75
 
b5cc75
             content: IconsList {
b5cc75
                 id: popup_area
b5cc75
-                icons_size: root_item.iconSize
b5cc75
+                icons_size: JS.ICONS_SIZE
b5cc75
                 model: model_popup
b5cc75
             }
b5cc75
         }