Navigation Menu

Skip to content

Commit

Permalink
media-keys: Use constant for icon size in OSD
Browse files Browse the repository at this point in the history
Signed-off-by: Zhang Xianwei <zhang.xianwei8@zte.com.cn>
  • Loading branch information
zhangxianwei8 authored and lukefromdc committed Nov 26, 2018
1 parent 4a54f68 commit bda6d7a
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions plugins/media-keys/msd-media-keys-window.c
Expand Up @@ -34,6 +34,8 @@


#define MSD_MEDIA_KEYS_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MSD_TYPE_MEDIA_KEYS_WINDOW, MsdMediaKeysWindowPrivate)) #define MSD_MEDIA_KEYS_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MSD_TYPE_MEDIA_KEYS_WINDOW, MsdMediaKeysWindowPrivate))


#define ICON_SCALE 0.65 /* size of the icon compared to the whole OSD */

struct MsdMediaKeysWindowPrivate struct MsdMediaKeysWindowPrivate
{ {
MsdMediaKeysWindowAction action; MsdMediaKeysWindowAction action;
Expand Down Expand Up @@ -482,8 +484,8 @@ draw_action_volume (MsdMediaKeysWindow *window,


gtk_window_get_size (GTK_WINDOW (window), &window_width, &window_height); gtk_window_get_size (GTK_WINDOW (window), &window_width, &window_height);


icon_box_width = round (window_width * 0.65); icon_box_width = round (window_width * ICON_SCALE);
icon_box_height = round (window_height * 0.65); icon_box_height = round (window_height * ICON_SCALE);
volume_box_width = icon_box_width; volume_box_width = icon_box_width;
volume_box_height = round (window_height * 0.05); volume_box_height = round (window_height * 0.05);


Expand Down Expand Up @@ -618,8 +620,8 @@ draw_action_custom (MsdMediaKeysWindow *window,


gtk_window_get_size (GTK_WINDOW (window), &window_width, &window_height); gtk_window_get_size (GTK_WINDOW (window), &window_width, &window_height);


icon_box_width = round (window_width * 0.65); icon_box_width = round (window_width * ICON_SCALE);
icon_box_height = round (window_height * 0.65); icon_box_height = round (window_height * ICON_SCALE);
label_box_width = round (window_width); label_box_width = round (window_width);
label_box_height = round (window_height * 0.175); label_box_height = round (window_height * 0.175);


Expand Down

0 comments on commit bda6d7a

Please sign in to comment.