Skip to content

Commit

Permalink
Change cursor-size to 24px
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
vkareh authored and raveit65 committed Apr 26, 2018
1 parent f031ccb commit 954bf58
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
2 changes: 1 addition & 1 deletion capplets/appearance/appearance-style.c
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -544,7 +544,7 @@ update_cursor_size_scale (MateThemeCursorInfo *theme,
if (theme && theme->sizes->len > 0) if (theme && theme->sizes->len > 0)
size = g_array_index (theme->sizes, gint, 0); size = g_array_index (theme->sizes, gint, 0);
else else
size = 18; size = 24;
} }


if (size != gsettings_size) if (size != gsettings_size)
Expand Down
10 changes: 3 additions & 7 deletions capplets/common/mate-theme-info.c
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include <gmodule.h> #include <gmodule.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <gdk/gdk.h>
#include <gdk/gdkx.h> #include <gdk/gdkx.h>
#include <gio/gio.h> #include <gio/gio.h>
#include <string.h> #include <string.h>
Expand Down Expand Up @@ -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); 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) if (str != NULL)
{ {
meta_theme_info->cursor_theme_name = g_strdup(str); meta_theme_info->cursor_theme_name = g_strdup(str);
Expand All @@ -395,14 +392,13 @@ MateThemeMetaInfo* mate_theme_read_meta_theme(GFile* meta_theme_uri)
if (str) if (str)
meta_theme_info->cursor_size = (int) g_ascii_strtoll(str, NULL, 10); meta_theme_info->cursor_size = (int) g_ascii_strtoll(str, NULL, 10);
else else
meta_theme_info->cursor_size = 18; meta_theme_info->cursor_size = 24;
} }
else else
{ {
meta_theme_info->cursor_theme_name = g_strdup("default"); 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); str = mate_desktop_item_get_string(meta_theme_ditem, APPLICATION_FONT_KEY);


Expand Down Expand Up @@ -545,7 +541,7 @@ read_cursor_theme (GFile *cursor_theme_uri)
MateThemeCursorInfo *cursor_theme_info = NULL; MateThemeCursorInfo *cursor_theme_info = NULL;
GFile *parent_uri, *cursors_uri; 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); const gint num_sizes = G_N_ELEMENTS (filter_sizes);


parent_uri = g_file_get_parent (cursor_theme_uri); parent_uri = g_file_get_parent (cursor_theme_uri);
Expand Down

0 comments on commit 954bf58

Please sign in to comment.