[gtk+] Revert "arrow: Make minimum size 5px"
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Revert "arrow: Make minimum size 5px"
- Date: Fri, 6 May 2011 17:37:32 +0000 (UTC)
commit f6e11febfad0fa2ecb88dc669d7f4b52e5244ca4
Author: Benjamin Otte <otte redhat com>
Date: Fri May 6 19:35:40 2011 +0200
Revert "arrow: Make minimum size 5px"
This reverts commit 1c46e04f30e8b496ac0cc3ad830b4824e54c1e94.
The change broke too many widgets that relied on the size being
constant. A proper fix would require letting themes override the size.
That would probably also require letting themes specify the size
relative to font size.
gtk/gtkarrow.c | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/gtk/gtkarrow.c b/gtk/gtkarrow.c
index 4da3872..9d46d69 100644
--- a/gtk/gtkarrow.c
+++ b/gtk/gtkarrow.c
@@ -52,8 +52,7 @@
#include "gtkprivate.h"
#include "gtkintl.h"
-#define MINIMUM_ARROW_SIZE 5
-#define NATURAL_ARROW_SIZE 15
+#define MIN_ARROW_SIZE 15
struct _GtkArrowPrivate
{
@@ -209,10 +208,10 @@ gtk_arrow_get_preferred_width (GtkWidget *widget,
gtk_misc_get_padding (GTK_MISC (widget), &xpad, NULL);
if (minimum_size)
- *minimum_size = MINIMUM_ARROW_SIZE + xpad * 2;
+ *minimum_size = MIN_ARROW_SIZE + xpad * 2;
if (natural_size)
- *natural_size = NATURAL_ARROW_SIZE + xpad * 2;
+ *natural_size = MIN_ARROW_SIZE + xpad * 2;
}
static void
@@ -225,10 +224,10 @@ gtk_arrow_get_preferred_height (GtkWidget *widget,
gtk_misc_get_padding (GTK_MISC (widget), NULL, &ypad);
if (minimum_size)
- *minimum_size = MINIMUM_ARROW_SIZE + ypad * 2;
+ *minimum_size = MIN_ARROW_SIZE + ypad * 2;
if (natural_size)
- *natural_size = NATURAL_ARROW_SIZE + ypad * 2;
+ *natural_size = MIN_ARROW_SIZE + ypad * 2;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]