[maemo-commits] [maemo-commits] r9897 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . gdk gtk

[From: subversion at stage.maemo.org]

Author: timj
Date: 2007-02-15 14:19:12 +0200 (Thu, 15 Feb 2007)
New Revision: 9897

Modified:
   projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
   projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/gdkinternals.h
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkarrow.c
Log:
Thu Feb 15 13:17:52 2007  Tim Janik  <timj at gtk.org>

        * gtk/gtkarrow.c (gtk_arrow_expose): removed arrow size down scaling
        to 70% to allow full arrow themability in maemo.

Thu Feb 15 11:45:41 2007  Tim Janik  <timj at gtk.org>

        * gdk/gdkinternals.h: applied patch to reduce scratch image sizes,
        this is in place to save server side memory resources.




Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-02-15 12:18:15 UTC (rev 9896)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-02-15 12:19:12 UTC (rev 9897)
@@ -1,3 +1,13 @@
+Thu Feb 15 13:17:52 2007  Tim Janik  <timj at gtk.org>
+
+	* gtk/gtkarrow.c (gtk_arrow_expose): removed arrow size down scaling
+	to 70% to allow full arrow themability in maemo.
+
+Thu Feb 15 11:45:41 2007  Tim Janik  <timj at gtk.org>
+
+	* gdk/gdkinternals.h: applied patch to reduce scratch image sizes,
+	this is in place to save server side memory resources.
+
 2007-02-15  Michael Natterer  <mitch at imendio.com>
 
 	Merged from upstream trunk:

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/gdkinternals.h
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/gdkinternals.h	2007-02-15 12:18:15 UTC (rev 9896)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/gdkinternals.h	2007-02-15 12:19:12 UTC (rev 9897)
@@ -186,8 +186,13 @@
                                   GdkWindowState unset_flags,
                                   GdkWindowState set_flags);
 
+#ifdef MAEMO_CHANGES
+#define GDK_SCRATCH_IMAGE_WIDTH 128
+#define GDK_SCRATCH_IMAGE_HEIGHT 32
+#else  /* !MAEMO_CHANGES */
 #define GDK_SCRATCH_IMAGE_WIDTH 256
 #define GDK_SCRATCH_IMAGE_HEIGHT 64
+#endif /* !MAEMO_CHANGES */
 
 GdkImage* _gdk_image_new_for_depth (GdkScreen    *screen,
 				    GdkImageType  type,

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkarrow.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkarrow.c	2007-02-15 12:18:15 UTC (rev 9896)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkarrow.c	2007-02-15 12:19:12 UTC (rev 9897)
@@ -221,6 +221,9 @@
       width = widget->allocation.width - misc->xpad * 2;
       height = widget->allocation.height - misc->ypad * 2;
       extent = MIN (width, height) * 0.7;
+#ifdef MAEMO_CHANGES
+      extent = MIN (width, height);
+#endif /* MAEMO_CHANGES */
       effective_arrow_type = arrow->arrow_type;
 
       if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)