summaryrefslogtreecommitdiff
path: root/src/ui
diff options
context:
space:
mode:
authorVictor Kareh <[email protected]>2021-06-14 08:40:35 -0400
committerVictor Kareh <[email protected]>2023-03-07 13:35:05 -0500
commitdf299574f6db9bcdccc9413f173c2dd4ceff6467 (patch)
tree73e9feadbeded2be39e8797563f4d35833bd7a99 /src/ui
parent319ee4ffaae7bec3289a1a65ce9774982564cd61 (diff)
downloadmarco-df299574f6db9bcdccc9413f173c2dd4ceff6467.tar.bz2
marco-df299574f6db9bcdccc9413f173c2dd4ceff6467.tar.xz
iconcache: replace width and height with size in read_icons
meta_read_icons is used in MetaWindow. In it ideal_width and ideal_height have same value - default icon size. Same with ideal_mini_width and ideal_mini_height. Simplify function by replacing width and height parameters with size parameter. Adapted from https://gitlab.gnome.org/GNOME/libwnck/-/commit/c1460f79
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/preview-widget.c4
-rw-r--r--src/ui/ui.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/ui/preview-widget.c b/src/ui/preview-widget.c
index e6e08073..9c7fd3ec 100644
--- a/src/ui/preview-widget.c
+++ b/src/ui/preview-widget.c
@@ -471,13 +471,13 @@ meta_preview_get_mini_icon (void)
if (icon_exists)
default_icon = gtk_icon_theme_load_icon (theme,
META_DEFAULT_ICON_NAME,
- META_MINI_ICON_WIDTH,
+ META_MINI_ICON_SIZE,
0,
NULL);
else
default_icon = gtk_icon_theme_load_icon (theme,
"image-missing",
- META_MINI_ICON_WIDTH,
+ META_MINI_ICON_SIZE,
0,
NULL);
diff --git a/src/ui/ui.c b/src/ui/ui.c
index 9976c701..6fc8403a 100644
--- a/src/ui/ui.c
+++ b/src/ui/ui.c
@@ -639,7 +639,7 @@ meta_ui_get_default_mini_icon (MetaUI *ui)
if (default_icon == NULL)
{
scale = gtk_widget_get_scale_factor (GTK_WIDGET (ui->frames));
- default_icon = load_default_window_icon (META_MINI_ICON_WIDTH, scale);
+ default_icon = load_default_window_icon (META_MINI_ICON_SIZE, scale);
g_assert (default_icon);
}
@@ -718,7 +718,7 @@ meta_ui_get_mini_icon_from_name (MetaUI *ui, char *name)
int size;
scale = gtk_widget_get_scale_factor (GTK_WIDGET (ui->frames));
- size = META_MINI_ICON_WIDTH / scale;
+ size = META_MINI_ICON_SIZE / scale;
return load_window_icon_from_name (name, size, scale);
}