summaryrefslogtreecommitdiff
path: root/capplets
diff options
context:
space:
mode:
authorVictor Kareh <[email protected]>2018-04-25 00:22:24 -0400
committerraveit65 <[email protected]>2018-04-26 10:02:19 +0200
commit954bf5889930cb92a2bb0b9e930984a619ef58b8 (patch)
treec6dc8292b8cdad87c09d00bc1dc8130106b8f58f /capplets
parentf031ccbb44a3623439a8717695f84f11472b609c (diff)
downloadmate-control-center-954bf5889930cb92a2bb0b9e930984a619ef58b8.tar.bz2
mate-control-center-954bf5889930cb92a2bb0b9e930984a619ef58b8.tar.xz
Change cursor-size to 24px
The MATE cursor theme does not have an 18px cursor size, so having a 18px as the default setting does not make sense. Using 24px looks better in modern displays and allows for proper HiDPI scaling.
Diffstat (limited to 'capplets')
-rw-r--r--capplets/appearance/appearance-style.c2
-rw-r--r--capplets/common/mate-theme-info.c10
2 files changed, 4 insertions, 8 deletions
diff --git a/capplets/appearance/appearance-style.c b/capplets/appearance/appearance-style.c
index 161917c2..d036c467 100644
--- a/capplets/appearance/appearance-style.c
+++ b/capplets/appearance/appearance-style.c
@@ -544,7 +544,7 @@ update_cursor_size_scale (MateThemeCursorInfo *theme,
if (theme && theme->sizes->len > 0)
size = g_array_index (theme->sizes, gint, 0);
else
- size = 18;
+ size = 24;
}
if (size != gsettings_size)
diff --git a/capplets/common/mate-theme-info.c b/capplets/common/mate-theme-info.c
index 3012c9b0..54ae3aea 100644
--- a/capplets/common/mate-theme-info.c
+++ b/capplets/common/mate-theme-info.c
@@ -32,7 +32,6 @@
#include <glib/gi18n.h>
#include <gmodule.h>
#include <gtk/gtk.h>
-#include <gdk/gdk.h>
#include <gdk/gdkx.h>
#include <gio/gio.h>
#include <string.h>
@@ -384,8 +383,6 @@ MateThemeMetaInfo* mate_theme_read_meta_theme(GFile* meta_theme_uri)
str = mate_desktop_item_get_string(meta_theme_ditem, CURSOR_THEME_KEY);
- GdkWindow *window = gdk_get_default_root_window ();
- gint scale = gdk_window_get_scale_factor (window);
if (str != NULL)
{
meta_theme_info->cursor_theme_name = g_strdup(str);
@@ -395,14 +392,13 @@ MateThemeMetaInfo* mate_theme_read_meta_theme(GFile* meta_theme_uri)
if (str)
meta_theme_info->cursor_size = (int) g_ascii_strtoll(str, NULL, 10);
else
- meta_theme_info->cursor_size = 18;
+ meta_theme_info->cursor_size = 24;
}
else
{
meta_theme_info->cursor_theme_name = g_strdup("default");
- meta_theme_info->cursor_size = 18;
+ meta_theme_info->cursor_size = 24;
}
- meta_theme_info->cursor_size *= scale;
str = mate_desktop_item_get_string(meta_theme_ditem, APPLICATION_FONT_KEY);
@@ -545,7 +541,7 @@ read_cursor_theme (GFile *cursor_theme_uri)
MateThemeCursorInfo *cursor_theme_info = NULL;
GFile *parent_uri, *cursors_uri;
- const gint filter_sizes[] = { 12, 16, 24, 32, 36, 40, 48, 64, 96, 128 };
+ const gint filter_sizes[] = { 12, 16, 18, 24, 32, 36, 40, 48, 64, 96, 128 };
const gint num_sizes = G_N_ELEMENTS (filter_sizes);
parent_uri = g_file_get_parent (cursor_theme_uri);