[gtk+] Revert "More label and image sizing fixes"
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Revert "More label and image sizing fixes"
- Date: Tue, 27 May 2014 17:13:33 +0000 (UTC)
commit 7c83a71239a46451b2cbab12618827509a5fbc85
Author: Matthias Clasen <mclasen redhat com>
Date: Tue May 27 13:04:34 2014 -0400
Revert "More label and image sizing fixes"
This reverts commit 68c1e83cf0fd7432dbb151ff351ce225708e3ffb.
gtk/gtkimage.c | 16 ++++------------
gtk/gtklabel.c | 11 -----------
2 files changed, 4 insertions(+), 23 deletions(-)
---
diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
index 17482c3..115920b 100644
--- a/gtk/gtkimage.c
+++ b/gtk/gtkimage.c
@@ -33,7 +33,6 @@
#include "gtkimageprivate.h"
#include "deprecated/gtkiconfactory.h"
#include "deprecated/gtkstock.h"
-#include "deprecated/gtkmisc.h"
#include "gtkicontheme.h"
#include "gtksizerequest.h"
#include "gtkintl.h"
@@ -1521,21 +1520,11 @@ gtk_image_get_padding_and_border (GtkImage *image,
GtkStyleContext *context;
GtkStateFlags state;
GtkBorder tmp;
- gint xpad, ypad;
context = gtk_widget_get_style_context (GTK_WIDGET (image));
state = gtk_widget_get_state_flags (GTK_WIDGET (image));
gtk_style_context_get_padding (context, state, border);
-
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- gtk_misc_get_padding (GTK_MISC (image), &xpad, &ypad);
- border->top += ypad;
- border->left += xpad;
- border->bottom += ypad;
- border->right += xpad;
-G_GNUC_END_IGNORE_DEPRECATIONS
-
gtk_style_context_get_border (context, state, &tmp);
border->top += tmp.top;
border->right += tmp.right;
@@ -1651,6 +1640,7 @@ gtk_image_draw (GtkWidget *widget,
GtkStyleContext *context;
gint x, y, width, height, baseline;
gfloat xalign, yalign;
+ GtkStateFlags state;
GtkBorder border;
g_return_val_if_fail (GTK_IS_IMAGE (widget), FALSE);
@@ -1659,6 +1649,8 @@ gtk_image_draw (GtkWidget *widget,
priv = image->priv;
context = gtk_widget_get_style_context (widget);
+ state = gtk_widget_get_state_flags (GTK_WIDGET (image));
+ gtk_style_context_get_border (context, state, &border);
gtk_render_background (context, cr,
0, 0,
@@ -1669,7 +1661,7 @@ gtk_image_draw (GtkWidget *widget,
xalign = halign_to_float (widget);
yalign = valign_to_float (widget);
- gtk_image_get_padding_and_border (image, &border);
+
gtk_image_get_preferred_size (image, &width, &height);
baseline = gtk_widget_get_allocated_baseline (widget);
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index bedfc1e..9bcf856 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -50,7 +50,6 @@
#include "gtkprivate.h"
#include "gtktypebuiltins.h"
#include "gtkmain.h"
-#include "deprecated/gtkmisc.h"
#include "a11y/gtklabelaccessibleprivate.h"
@@ -3227,21 +3226,11 @@ gtk_label_get_padding_and_border (GtkLabel *label,
GtkStyleContext *context;
GtkStateFlags state;
GtkBorder tmp;
- gint xpad, ypad;
context = gtk_widget_get_style_context (GTK_WIDGET (label));
state = gtk_widget_get_state_flags (GTK_WIDGET (label));
gtk_style_context_get_padding (context, state, border);
-
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- gtk_misc_get_padding (GTK_MISC (label), &xpad, &ypad);
- border->top += ypad;
- border->left += xpad;
- border->bottom += ypad;
- border->right += xpad;
-G_GNUC_END_IGNORE_DEPRECATIONS
-
gtk_style_context_get_border (context, state, &tmp);
border->top += tmp.top;
border->right += tmp.right;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]