callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "More label and image sizing fixes"

Browse Source 
This reverts commit 68c1e83cf0.
This commit is contained in:
Matthias Clasen
2014-05-27 13:04:34 -04:00
parent d9bdb9a137
commit 7c83a71239
2 changed files with 4 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gtk/gtklabel.c
View File

@ -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;