58 lines
1.5 KiB
Diff
58 lines
1.5 KiB
Diff
|
From 489b59867ce752a19d01fa43a86bbcefe6e7d8cf Mon Sep 17 00:00:00 2001
|
||
|
|
From: Matthias Clasen <mclasen@redhat.com>
|
||
|
|
Date: Thu, 29 May 2014 10:30:57 -0400
|
||
|
|
Subject: [PATCH] Revert "GtkMisc: Keep gtk_misc_set_alignment working"
|
||
|
|
|
||
|
|
This reverts commit aabc356b80fab025d460f61b6c08743b2c10e20d.
|
||
|
|
|
||
|
|
Labels are back to looking at x/yalign (for now).
|
||
|
|
---
|
||
|
|
gtk/deprecated/gtkmisc.c | 24 ------------------------
|
||
|
|
1 file changed, 24 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/gtk/deprecated/gtkmisc.c b/gtk/deprecated/gtkmisc.c
|
||
|
|
index ff4db12..303b5e7 100644
|
||
|
|
--- a/gtk/deprecated/gtkmisc.c
|
||
|
|
+++ b/gtk/deprecated/gtkmisc.c
|
||
|
|
@@ -27,8 +27,6 @@
|
||
|
|
#include "gtkmisc.h"
|
||
|
|
#include "gtkintl.h"
|
||
|
|
#include "gtkprivate.h"
|
||
|
|
-#include "gtkimage.h"
|
||
|
|
-#include "gtklabel.h"
|
||
|
|
|
||
|
|
|
||
|
|
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
|
||
|
|
@@ -234,28 +232,6 @@ gtk_misc_set_alignment (GtkMisc *misc,
|
||
|
|
|
||
|
|
priv = misc->priv;
|
||
|
|
|
||
|
|
- if (GTK_IS_LABEL (misc) || GTK_IS_IMAGE (misc))
|
||
|
|
- {
|
||
|
|
- GtkAlign halign, valign;
|
||
|
|
-
|
||
|
|
- if (xalign < 0.4)
|
||
|
|
- halign = GTK_ALIGN_START;
|
||
|
|
- else if (xalign > 0.6)
|
||
|
|
- halign = GTK_ALIGN_END;
|
||
|
|
- else
|
||
|
|
- halign = GTK_ALIGN_CENTER;
|
||
|
|
-
|
||
|
|
- if (yalign < 0.4)
|
||
|
|
- valign = GTK_ALIGN_START;
|
||
|
|
- else if (yalign > 0.6)
|
||
|
|
- valign = GTK_ALIGN_END;
|
||
|
|
- else
|
||
|
|
- valign = GTK_ALIGN_CENTER;
|
||
|
|
-
|
||
|
|
- gtk_widget_set_halign (GTK_WIDGET (misc), halign);
|
||
|
|
- gtk_widget_set_valign (GTK_WIDGET (misc), valign);
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
if (xalign < 0.0)
|
||
|
|
xalign = 0.0;
|
||
|
|
else if (xalign > 1.0)
|
||
|
|
--
|
||
|
|
2.0.0
|
||
|
|
|