summaryrefslogtreecommitdiff
path: root/src/ui
diff options
context:
space:
mode:
authormonsta <[email protected]>2017-01-06 17:54:38 +0300
committermonsta <[email protected]>2017-01-06 17:54:38 +0300
commit1cdde13577525fda5609ed2a494f743e979f6e10 (patch)
tree7f635a329ecde61e222dbdce55771fc048b5cb97 /src/ui
parentfb3226178463ccbf3effa1e7445731e2edf2fa7c (diff)
downloadmarco-1cdde13577525fda5609ed2a494f743e979f6e10.tar.bz2
marco-1cdde13577525fda5609ed2a494f743e979f6e10.tar.xz
theme-viewer: use GdkRGBA instead of GdkColor
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/theme-viewer.c31
1 files changed, 17 insertions, 14 deletions
diff --git a/src/ui/theme-viewer.c b/src/ui/theme-viewer.c
index 0553b3c0..879e39ab 100644
--- a/src/ui/theme-viewer.c
+++ b/src/ui/theme-viewer.c
@@ -353,14 +353,15 @@ border_only_contents (void)
GtkWidget *event_box;
GtkWidget *vbox;
GtkWidget *w;
- GdkColor color;
+ GdkRGBA color;
event_box = gtk_event_box_new ();
- color.red = 40000;
+ color.red = 0.6;
color.green = 0;
- color.blue = 40000;
- gtk_widget_modify_bg (event_box, GTK_STATE_NORMAL, &color);
+ color.blue = 0.6;
+ color.alpha = 1.0;
+ gtk_widget_override_background_color (event_box, 0, &color);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 3);
@@ -468,7 +469,7 @@ preview_collection (int font_size,
{
GtkWidget *box;
GtkWidget *sw;
- GdkColor desktop_color;
+ GdkRGBA desktop_color;
int i;
GtkWidget *eventbox;
@@ -486,11 +487,12 @@ preview_collection (int font_size,
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (sw), eventbox);
- desktop_color.red = 0x5144;
- desktop_color.green = 0x75D6;
- desktop_color.blue = 0xA699;
+ desktop_color.red = 0.32;
+ desktop_color.green = 0.46;
+ desktop_color.blue = 0.65;
+ desktop_color.alpha = 1.0;
- gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &desktop_color);
+ gtk_widget_override_background_color (eventbox, 0, &desktop_color);
i = 0;
while (i < META_FRAME_TYPE_LAST)
@@ -685,7 +687,7 @@ previews_of_button_layouts (void)
static gboolean initted = FALSE;
GtkWidget *box;
GtkWidget *sw;
- GdkColor desktop_color;
+ GdkRGBA desktop_color;
int i;
GtkWidget *eventbox;
@@ -709,11 +711,12 @@ previews_of_button_layouts (void)
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (sw), eventbox);
- desktop_color.red = 0x5144;
- desktop_color.green = 0x75D6;
- desktop_color.blue = 0xA699;
+ desktop_color.red = 0.32;
+ desktop_color.green = 0.46;
+ desktop_color.blue = 0.65;
+ desktop_color.alpha = 1.0;
- gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &desktop_color);
+ gtk_widget_override_background_color (eventbox, 0, &desktop_color);
i = 0;
while (i < BUTTON_LAYOUT_COMBINATIONS)