summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorosch <oliver at luced de>2019-04-14 19:29:48 +0200
committerlukefromdc <[email protected]>2019-04-23 18:35:39 +0000
commit6d7a203c0c920f14a647d8ce5cce36d45a31c8c8 (patch)
treeaf198ba698cb4c35c95d3ce2144b96ae02c0304e
parentcd29bd6650923ab46b24eecc4681298c081dbf1e (diff)
downloadmarco-6d7a203c0c920f14a647d8ce5cce36d45a31c8c8.tar.bz2
marco-6d7a203c0c920f14a647d8ce5cce36d45a31c8c8.tar.xz
Limit icon size to 1024
-rw-r--r--src/core/prefs.c2
-rw-r--r--src/include/common.h3
-rw-r--r--src/org.mate.marco.gschema.xml2
3 files changed, 5 insertions, 2 deletions
diff --git a/src/core/prefs.c b/src/core/prefs.c
index 7e4db4e9..5565f744 100644
--- a/src/core/prefs.c
+++ b/src/core/prefs.c
@@ -518,7 +518,7 @@ static MetaIntPreference preferences_int[] =
KEY_GENERAL_SCHEMA,
META_PREF_ICON_SIZE,
&icon_size,
- 6, G_MAXINT, META_DEFAULT_ICON_SIZE,
+ META_MIN_ICON_SIZE, META_MAX_ICON_SIZE, META_DEFAULT_ICON_SIZE,
},
{ NULL, NULL, 0, NULL, 0, 0, 0, },
};
diff --git a/src/include/common.h b/src/include/common.h
index 1fe3aae1..89e85a56 100644
--- a/src/include/common.h
+++ b/src/include/common.h
@@ -302,6 +302,9 @@ struct _MetaButtonLayout
/* should investigate changing these to whatever most apps use */
#define META_DEFAULT_ICON_SIZE 48
+#define META_MIN_ICON_SIZE 6
+#define META_MAX_ICON_SIZE 1024
+
#define META_MINI_ICON_WIDTH 16
#define META_MINI_ICON_HEIGHT 16
diff --git a/src/org.mate.marco.gschema.xml b/src/org.mate.marco.gschema.xml
index 7956af6e..a06c48da 100644
--- a/src/org.mate.marco.gschema.xml
+++ b/src/org.mate.marco.gschema.xml
@@ -197,7 +197,7 @@
<description>Comma separated class list. Each running GUI application referenced to given windows manager class will be ignored by 'Show Desktop' functionality.</description>
</key>
<key name="icon-size" type="i">
- <range min="6" />
+ <range min="6" max="1024"/>
<default>48</default>
<summary>Icon size</summary>
<description>Size of the application icons displayed in alt-tab popup window. The screen's scale factor is applied to this value.</description>