diff options
| author | Eric Koegel <eric.koegel@gmail.com> | 2016-03-26 21:58:37 +0300 |
|---|---|---|
| committer | Eric Koegel <eric.koegel@gmail.com> | 2016-03-26 21:58:37 +0300 |
| commit | 347eb6a1197d843490c66751eeede24888e5af77 (patch) | |
| tree | fbbe822ed95ef8fe9346938a12fdba515f563f25 /libxfsm | |
| parent | 2d0b0a81825331b8ef6889394f62a461dffe7a34 (diff) | |
| download | xfce4-session-347eb6a1197d843490c66751eeede24888e5af77.tar.gz | |
Port libxfsm to Gtk3
Diffstat (limited to 'libxfsm')
| -rw-r--r-- | libxfsm/xfsm-util.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/libxfsm/xfsm-util.c b/libxfsm/xfsm-util.c index 2ab87fe8..54a4bdc4 100644 --- a/libxfsm/xfsm-util.c +++ b/libxfsm/xfsm-util.c @@ -126,7 +126,7 @@ xfsm_place_trash_window (GtkWindow *window, GdkRectangle geometry; gdk_screen_get_monitor_geometry (screen, monitor, &geometry); - gtk_widget_size_request (GTK_WIDGET (window), &requisition); + gtk_widget_get_preferred_size (GTK_WIDGET (window), &requisition, NULL); gtk_window_move (window, 0, geometry.height - requisition.height); } @@ -157,12 +157,16 @@ void xfsm_window_add_border (GtkWindow *window) { GtkWidget *box1, *box2; + GdkRGBA bg_color; gtk_widget_realize(GTK_WIDGET(window)); box1 = gtk_event_box_new (); - gtk_widget_modify_bg (box1, GTK_STATE_NORMAL, - &(gtk_widget_get_style (GTK_WIDGET(window))->bg [GTK_STATE_SELECTED])); + gtk_style_context_get_background_color(gtk_widget_get_style_context (GTK_WIDGET(window)), + GTK_STATE_SELECTED, + &bg_color); + gtk_widget_override_background_color (box1, GTK_STATE_NORMAL, + &bg_color); gtk_widget_show (box1); box2 = gtk_event_box_new (); @@ -170,7 +174,7 @@ xfsm_window_add_border (GtkWindow *window) gtk_container_add (GTK_CONTAINER (box1), box2); gtk_container_set_border_width (GTK_CONTAINER (box2), 6); - gtk_widget_reparent (gtk_bin_get_child(GTK_BIN (window)), box2); + gtk_container_add (GTK_CONTAINER (gtk_bin_get_child (GTK_BIN (window))), box2); gtk_container_add (GTK_CONTAINER (window), box1); } |