r1143 - trunk/src/target/OM-2007/openmoko-libs/libmokoui

ken_zhao at sita.openmoko.org ken_zhao at sita.openmoko.org
Tue Feb 27 02:09:41 CET 2007


Author: ken_zhao
Date: 2007-02-27 02:09:32 +0100 (Tue, 27 Feb 2007)
New Revision: 1143

Modified:
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-alignment.c
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-tool-box.c
Log:
moko-finger-tool-box:use "gtk_widget_style_get" to reset padding because "gtk_alignment_get_padding" can't get padding from gtkrc.


Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-alignment.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-alignment.c	2007-02-26 23:49:31 UTC (rev 1142)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-alignment.c	2007-02-27 01:09:32 UTC (rev 1143)
@@ -150,6 +150,18 @@
 
         guint p_top, p_bottom, p_left, p_right;
         gtk_alignment_get_padding (GTK_ALIGNMENT (widget), &p_top, &p_bottom, &p_left, &p_right);
+        
+        //If padding defined in gtkrc, reset top/bottom/left/right.
+        GtkBorder* padding = NULL;
+        gtk_widget_style_get (widget, "padding", &padding, NULL);
+        if ( padding )
+        {
+            p_top    = padding->top;
+            p_bottom = padding->bottom;
+            p_left   = padding->left;
+            p_right  = padding->right;
+        }
+        
 
         padding_horizontal = p_left + p_right;
         padding_vertical = p_top + p_bottom;

Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-tool-box.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-tool-box.c	2007-02-26 23:49:31 UTC (rev 1142)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-tool-box.c	2007-02-27 01:09:32 UTC (rev 1143)
@@ -159,8 +159,20 @@
     guint padding_right;
 
     gtk_alignment_get_padding( GTK_ALIGNMENT(widget), &padding_top, &padding_bottom, &padding_left, &padding_right );
+    
+    //If padding defined in gtkrc, reset top/bottom/left/right.
+    GtkBorder* padding = NULL;
+    gtk_widget_style_get (widget, "padding", &padding, NULL);
+    if ( padding )
+    {
+        padding_top    = padding->top;
+        padding_bottom = padding->bottom;
+        padding_left   = padding->left;
+        padding_right  = padding->right;
+    }    
     moko_debug( "my padding is %d, %d, %d, %d", padding_left, padding_top, padding_right, padding_bottom );
 
+
     //FIXME unref all existing pixmaps, check whether we really need to draw new ones
 
     moko_debug( "generating pixmaps for size = %d, %d", a->width, a->height );





More information about the commitlog mailing list