[metacity] theme-viewer: don't use deprecated GtkAlignment



commit 66d54f5df2b91373bab7949a1388a463a8a9097d
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Mon Nov 24 18:41:45 2014 +0200

    theme-viewer: don't use deprecated GtkAlignment

 src/ui/theme-viewer.c |   27 ++++++++++-----------------
 1 files changed, 10 insertions(+), 17 deletions(-)
---
diff --git a/src/ui/theme-viewer.c b/src/ui/theme-viewer.c
index 42245c4..acab3a7 100644
--- a/src/ui/theme-viewer.c
+++ b/src/ui/theme-viewer.c
@@ -544,8 +544,7 @@ preview_collection (int font_size,
     {
       const char *title = NULL;
       GtkWidget *contents;
-      GtkWidget *align;
-      double xalign, yalign;
+      GtkAlign xalign, yalign;
       GtkWidget *eventbox2;
       GtkWidget *preview;
       PangoFontDescription *font_desc;
@@ -571,19 +570,19 @@ preview_collection (int font_size,
 
       if (i == META_FRAME_TYPE_MENU)
         {
-          xalign = 0.0;
-          yalign = 0.0;
+          xalign = GTK_ALIGN_START;
+          yalign = GTK_ALIGN_START;
         }
       else
         {
-          xalign = 0.5;
-          yalign = 0.5;
+          xalign = GTK_ALIGN_FILL;
+          yalign = GTK_ALIGN_FILL;
         }
 
-      align = gtk_alignment_new (0.0, 0.0, xalign, yalign);
-      gtk_container_add (GTK_CONTAINER (align), eventbox2);
+      gtk_widget_set_halign (eventbox2, xalign);
+      gtk_widget_set_valign (eventbox2, yalign);
 
-      gtk_box_pack_start (GTK_BOX (box), align, TRUE, TRUE, 0);
+      gtk_box_pack_start (GTK_BOX (box), eventbox2, TRUE, TRUE, 0);
 
       switch (font_size)
         {
@@ -766,8 +765,6 @@ previews_of_button_layouts (void)
   i = 0;
   while (i < BUTTON_LAYOUT_COMBINATIONS)
     {
-      GtkWidget *align;
-      double xalign, yalign;
       GtkWidget *eventbox2;
       GtkWidget *preview;
       char *title;
@@ -787,13 +784,9 @@ previews_of_button_layouts (void)
       meta_preview_set_button_layout (META_PREVIEW (preview),
                                       &different_layouts[i]);
 
-      xalign = 0.5;
-      yalign = 0.5;
+      gtk_widget_set_halign (eventbox2, GTK_ALIGN_FILL);
 
-      align = gtk_alignment_new (0.0, 0.0, xalign, yalign);
-      gtk_container_add (GTK_CONTAINER (align), eventbox2);
-
-      gtk_box_pack_start (GTK_BOX (box), align, TRUE, TRUE, 0);
+      gtk_box_pack_start (GTK_BOX (box), eventbox2, TRUE, TRUE, 0);
 
       previews[META_FRAME_TYPE_LAST*FONT_SIZE_LAST + i] = preview;
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]