Revert "GtkMisc: Keep gtk_misc_set_alignment working"

This reverts commit aabc356b80.

Labels are back to looking at x/yalign (for now).
This commit is contained in:
Matthias Clasen 2014-05-29 10:30:57 -04:00
parent 618e3d3157
commit 489b59867c

View File

@ -27,8 +27,6 @@
#include "gtkmisc.h" #include "gtkmisc.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkimage.h"
#include "gtklabel.h"
G_GNUC_BEGIN_IGNORE_DEPRECATIONS G_GNUC_BEGIN_IGNORE_DEPRECATIONS
@ -234,28 +232,6 @@ gtk_misc_set_alignment (GtkMisc *misc,
priv = misc->priv; 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) if (xalign < 0.0)
xalign = 0.0; xalign = 0.0;
else if (xalign > 1.0) else if (xalign > 1.0)