r269 - in trunk/src/target/OM-2007: artwork/themes/openmoko-standard/gtk-2.0 openmoko-libs/libmokoui
mickey at gta01.hmw-consulting.de
mickey at gta01.hmw-consulting.de
Wed Nov 29 10:56:12 CET 2006
Author: mickey
Date: 2006-11-29 09:56:11 +0000 (Wed, 29 Nov 2006)
New Revision: 269
Modified:
trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/mokofingertoolbox
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-alignment.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-tool-box.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-window.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-window.h
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-pixmap-button.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-window.c
Log:
mokoui improvements:
* MokoAlignment now parses the gtk style property MokoAlignment::padding = { left, right, top, bottom }
* MokoFingerToolBox uses less hardcoded values
* MokoFingerToolBox uses only a right button to switch between pages of buttons, this improves usability a lot
Modified: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/mokofingertoolbox
===================================================================
--- trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/mokofingertoolbox 2006-11-29 09:40:13 UTC (rev 268)
+++ trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/mokofingertoolbox 2006-11-29 09:56:11 UTC (rev 269)
@@ -103,7 +103,7 @@
style "mokofingertoolbox"
{
bg_pixmap[NORMAL] = "mokofingertoolbox.png"
- MokoAlignment::padding = { 0, 0, 0, 0 }
+ MokoAlignment::padding = { 35, 0, 0, 0 }
}
widget "*.mokofingertoolbox" style "mokofingertoolbox"
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-alignment.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-alignment.c 2006-11-29 09:40:13 UTC (rev 268)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-alignment.c 2006-11-29 09:56:11 UTC (rev 269)
@@ -23,6 +23,8 @@
#define MOKO_ALIGNMENT_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MOKO_TYPE_ALIGNMENT, MokoAlignmentPrivate))
+static GtkAlignmentClass* parent_class = NULL;
+
//FIXME this is a bit hackish
#define GTK_ALIGNMENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_ALIGNMENT, GtkAlignmentPrivate))
typedef struct _GtkAlignmentPrivate
@@ -37,12 +39,92 @@
{
} MokoAlignmentPrivate;
-//FIXME read padding from style and apply somewhere...
+/* forward declarations */
+static void moko_alignment_realize(GtkWidget* widget);
+static void moko_alignment_size_request(GtkWidget* widget, GtkRequisition* requisition);
+static void moko_alignment_size_allocate(GtkWidget* widget, GtkAllocation* allocation);
-/* forward declarations */
+
static void
-moko_alignment_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
+moko_alignment_class_init (MokoAlignmentClass *klass)
{
+ /* hook parent */
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ parent_class = g_type_class_peek_parent(klass);
+ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+ /* register private data */
+ g_type_class_add_private (klass, sizeof (MokoAlignmentPrivate));
+
+ /* hook virtual methods */
+ widget_class->realize = moko_alignment_realize;
+ widget_class->size_request = moko_alignment_size_request;
+ widget_class->size_allocate = moko_alignment_size_allocate;
+
+ /* install properties */
+ gtk_widget_class_install_style_property( widget_class, g_param_spec_boxed(
+ "padding",
+ "Alignment Padding",
+ "Sets the padding to a fixed value",
+ GTK_TYPE_BORDER, G_PARAM_READABLE) );
+}
+
+static void
+moko_alignment_init (MokoAlignment *self)
+{
+ //FIXME do we need this?
+ //gtk_widget_set_redraw_on_allocate( GTK_WIDGET(self), TRUE );
+ GTK_WIDGET_UNSET_FLAGS( GTK_WIDGET(self), GTK_NO_WINDOW );
+}
+
+GtkWidget*
+moko_alignment_new (void)
+{
+ return GTK_WIDGET(g_object_new(moko_alignment_get_type(), NULL));
+}
+
+static void moko_alignment_size_request(GtkWidget* widget, GtkRequisition* requisition)
+{
+ g_debug( "moko_alignment_size_request" );
+ GtkBorder* padding = NULL;
+
+ gtk_widget_style_get(GTK_WIDGET (widget),
+ "padding", &padding,
+ NULL);
+
+ GtkAlignmentPrivate *priv = GTK_ALIGNMENT_GET_PRIVATE(widget);
+ if ( padding )
+ {
+ priv->padding_top = padding->top;
+ priv->padding_bottom = padding->bottom;
+ priv->padding_left = padding->left;
+ priv->padding_right = padding->right;
+ }
+
+ GtkBin* bin = GTK_BIN(widget);
+
+ requisition->width = GTK_CONTAINER (widget)->border_width * 2;
+ requisition->height = GTK_CONTAINER (widget)->border_width * 2;
+
+ if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
+ {
+ GtkRequisition child_requisition;
+
+ gtk_widget_size_request (bin->child, &child_requisition);
+
+ requisition->width += child_requisition.width;
+ requisition->height += child_requisition.height;
+
+ /* Request extra space for the padding: */
+ requisition->width += (priv->padding_left + priv->padding_right);
+ requisition->height += (priv->padding_top + priv->padding_bottom);
+ }
+}
+
+static void
+moko_alignment_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
+{
+ g_debug( "moko_alignment_size_allocate" );
GtkAlignment *alignment;
GtkBin *bin;
GtkAllocation child_allocation;
@@ -119,7 +201,7 @@
}
static void
-moko_alignment_realize (GtkWidget* widget)
+moko_alignment_realize(GtkWidget* widget)
{
g_debug( "moko_alignment_realize" );
@@ -146,36 +228,6 @@
widget->style = gtk_style_attach (widget->style, widget->window);
//FIXME find out why a pixmap engine doesn't want to draw on an Alignment even though it has a GdkWindow
+ //Answer: because the background pixmap gets drawn by the X server, no one calls gtk_paint_flat_box or so
gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
}
-
-static void
-moko_alignment_class_init (MokoAlignmentClass *klass)
-{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
- GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-
- /* register private data */
- g_type_class_add_private (klass, sizeof (MokoAlignmentPrivate));
-
- /* hook virtual methods */
- widget_class->realize = moko_alignment_realize;
- widget_class->size_allocate = moko_alignment_size_allocate;
-
- /* install properties */
- /* ... */
-}
-
-static void
-moko_alignment_init (MokoAlignment *self)
-{
- //FIXME do we need this?
- //gtk_widget_set_redraw_on_allocate( GTK_WIDGET(self), TRUE );
- GTK_WIDGET_UNSET_FLAGS( GTK_WIDGET(self), GTK_NO_WINDOW );
-}
-
-GtkWidget*
-moko_alignment_new (void)
-{
- return GTK_WIDGET(g_object_new(moko_alignment_get_type(), NULL));
-}
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 2006-11-29 09:40:13 UTC (rev 268)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-tool-box.c 2006-11-29 09:56:11 UTC (rev 269)
@@ -22,33 +22,35 @@
#include <gtk/gtkhbox.h>
+#define DEBUG_THIS_FILE
+#ifdef DEBUG_THIS_FILE
+#define moko_debug(fmt,...) g_debug(fmt,##__VA_ARGS__)
+#else
+#define moko_debug(fmt,...)
+#endif
+
G_DEFINE_TYPE (MokoFingerToolBox, moko_finger_tool_box, MOKO_TYPE_ALIGNMENT)
#define MOKO_FINGER_TOOL_BOX_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MOKO_TYPE_FINGER_TOOL_BOX, MokoFingerToolBoxPrivate))
-#define OUTER_PADDING 35
#define INNER_PADDING 10
-
static void moko_finger_tool_box_show(GtkWidget* widget);
static void moko_finger_tool_box_hide(GtkWidget* widget);
-static MokoAlignmentClass *parent_class = NULL;
+static MokoAlignmentClass* parent_class = NULL;
typedef struct _MokoFingerToolBoxPrivate
{
GdkBitmap* mask;
-
- MokoPixmapButton* leftarrow;
GtkHBox* hbox;
MokoPixmapButton* rightarrow;
+ gboolean rightArrowVisible;
guint maxButtonsPerPage;
guint numberOfButtons;
guint leftButton;
+ guint buttonWidth;
- gboolean leftArrowVisible;
- gboolean rightArrowVisible;
-
GtkWindow* popup;
} MokoFingerToolBoxPrivate;
@@ -90,14 +92,14 @@
static void
cb_size_allocate(GtkWidget* widget, GtkAllocation* allocation, MokoFingerToolBox* self)
{
- g_debug( "size allocate %d, %d, %d, %d", allocation->x, allocation->y, allocation->width, allocation->height );
+ moko_debug( "size allocate %d, %d, %d, %d", allocation->x, allocation->y, allocation->width, allocation->height );
MokoFingerToolBoxPrivate* priv = MOKO_FINGER_TOOL_BOX_GET_PRIVATE(self);
GtkAllocation* a = >K_WIDGET(priv->hbox)->allocation;
//FIXME get from style
- priv->maxButtonsPerPage = a->width / 71;
+ priv->maxButtonsPerPage = a->width / priv->buttonWidth;
GtkRequisition* r = >K_WIDGET(priv->hbox)->requisition;
@@ -107,66 +109,64 @@
{
MokoFingerToolBoxPrivate* priv = MOKO_FINGER_TOOL_BOX_GET_PRIVATE(self);
guint maxButtonsPerPage = priv->maxButtonsPerPage;
- if ( priv->rightArrowVisible || priv->leftArrowVisible ) maxButtonsPerPage--;
+ if ( priv->rightArrowVisible ) maxButtonsPerPage--;
- g_debug( "child: '%s'", gtk_widget_get_name( child ) );
+ moko_debug( "maxButtonsPerPage = %d", maxButtonsPerPage );
+
+ moko_debug( "child: '%s'", gtk_widget_get_name( child ) );
if ( strcmp( "mokofingertoolbox-toolbutton", gtk_widget_get_name( child ) ) == 0 )
{
- if ( numChild < priv->leftButton || numChild > priv->leftButton + maxButtonsPerPage )
+ if ( numChild < priv->leftButton || numChild > priv->leftButton + maxButtonsPerPage-1 )
{
- g_debug( "hiding child %d", numChild );
+ moko_debug( "hiding child %d", numChild );
gtk_widget_hide( child );
}
else
{
- g_debug( "showing child %d", numChild );
+ moko_debug( "showing child %d", numChild );
gtk_widget_show( child );
}
}
numChild++;
}
- gboolean oldLeftArrowVisible = priv->leftArrowVisible;
gboolean oldRightArrowVisible = priv->rightArrowVisible;
- if /* ( r->width > a->width ) */ ( priv->numberOfButtons > priv->maxButtonsPerPage )
- {
- priv->leftArrowVisible = priv->leftButton > 0;
- priv->rightArrowVisible = priv->leftButton + priv->maxButtonsPerPage < priv->numberOfButtons;
- }
+ priv->rightArrowVisible = priv->numberOfButtons > priv->maxButtonsPerPage;
gtk_container_foreach( GTK_CONTAINER(priv->hbox), &checkstatus, self );
- if ( priv->leftArrowVisible )
- gtk_widget_show( GTK_WIDGET(priv->leftarrow) );
- else
- gtk_widget_hide( GTK_WIDGET(priv->leftarrow) );
if ( priv->rightArrowVisible )
gtk_widget_show( GTK_WIDGET(priv->rightarrow) );
else
gtk_widget_hide( GTK_WIDGET(priv->rightarrow) );
- g_debug( "left button = %d, right button = %d", priv->leftArrowVisible, priv->rightArrowVisible );
-
-
- //g_object_unref(G_OBJECT(alphapixbuf));
- //g_object_unref(G_OBJECT(pixbuf));
- //gtk_widget_shape_combine_mask(priv->popup, mask, 0, 0);
-
+ moko_debug( "right button = %d", priv->rightArrowVisible );
}
static void
cb_configure(GtkWidget* widget, GtkAllocation* a, MokoFingerToolBox* self)
{
+ guint padding_top;
+ guint padding_bottom;
+ guint padding_left;
+ guint padding_right;
+
+ gtk_alignment_get_padding( GTK_ALIGNMENT(widget), &padding_top, &padding_bottom, &padding_left, &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
- g_debug( "generating pixmaps for size = %d, %d", a->width, a->height );
+ moko_debug( "generating pixmaps for size = %d, %d", a->width, a->height );
MokoFingerToolBoxPrivate* priv = MOKO_FINGER_TOOL_BOX_GET_PRIVATE(self);
+ guint maxButtonsPerPage = priv->maxButtonsPerPage;
+ if ( priv->rightArrowVisible ) maxButtonsPerPage--;
+ moko_debug( "max buttons per page is %d", maxButtonsPerPage );
//FIXME generate all possible combinations of mask images, not just one w/ 4 buttons
- gtk_widget_ensure_style( GTK_WIDGET(self) );
+ //gtk_widget_ensure_style( GTK_WIDGET(self) );
GtkStyle* style = gtk_rc_get_style( GTK_WIDGET(self) );
g_assert( style->rc_style );
@@ -175,7 +175,7 @@
GdkPixbuf* button = gdk_pixbuf_new_from_file( g_build_filename( moko_application_get_style_pixmap_dir(), "btn_type03.png", NULL ), NULL );
guint w = gdk_pixbuf_get_width( button );
guint h = gdk_pixbuf_get_height( button );
- guint x = OUTER_PADDING - 1;
+ guint x = padding_left - 1;
guint y = 0;
gdk_pixbuf_copy_area( background, 0, 0, gdk_pixbuf_get_width( background ), gdk_pixbuf_get_height( background ), pixbuf, 0, 0 );
@@ -187,6 +187,7 @@
gdk_pixbuf_composite( button, pixbuf, x, y, w, h, x, y+2, 1, 1, GDK_INTERP_NEAREST, 255 );
x += w + INNER_PADDING - 2;
}
+
#ifdef CRAZY_DEBUG_CODE
GtkWindow* window = gtk_window_new( GTK_WINDOW_TOPLEVEL );
GtkImage* image = gtk_image_new_from_pixbuf( pixbuf );
@@ -198,23 +199,17 @@
gdk_pixbuf_render_pixmap_and_mask( pixbuf, &pixmap, &priv->mask, 1);
g_object_unref( pixmap );
gtk_widget_shape_combine_mask(priv->popup, priv->mask, 0, 0);
-}
-static void
-cb_left_button_pressed(GtkWidget* widget, MokoFingerToolBox* self)
-{
- g_debug( "left button pressed" );
- MokoFingerToolBoxPrivate* priv = MOKO_FINGER_TOOL_BOX_GET_PRIVATE(self);
- priv->leftButton -= priv->maxButtonsPerPage;
- //FIXME force redraw
+ priv->buttonWidth = w;
}
static void
cb_right_button_pressed(GtkWidget* widget, MokoFingerToolBox* self)
{
- g_debug( "right button pressed" );
+ moko_debug( "right button pressed" );
MokoFingerToolBoxPrivate* priv = MOKO_FINGER_TOOL_BOX_GET_PRIVATE(self);
- priv->leftButton += priv->maxButtonsPerPage;
+ priv->leftButton += priv->maxButtonsPerPage; // % priv->numberOfButtons;
+ if ( priv->leftButton > priv->numberOfButtons ) priv->leftButton = 0;
// force redraw
//FIXME force redraw
}
@@ -222,7 +217,7 @@
static void moko_finger_tool_box_show(GtkWidget* widget)
{
//gtk_widget_ensure_style( widget ); //FIXME needed here?
- g_debug( "moko_finger_wheel_show" );
+ moko_debug( "moko_finger_wheel_show" );
GTK_WIDGET_CLASS(parent_class)->show(widget);
MokoFingerToolBoxPrivate* priv = MOKO_FINGER_TOOL_BOX_GET_PRIVATE(widget);
if ( !priv->popup )
@@ -234,10 +229,10 @@
MokoWindow* window = moko_application_get_main_window( moko_application_get_instance() );
GtkRequisition req;
gtk_widget_size_request( widget, &req );
- //g_debug( "My requisition is %d, %d", req.width, req.height );
+ //moko_debug( "My requisition is %d, %d", req.width, req.height );
int x, y, w, h;
gdk_window_get_geometry( GTK_WIDGET(window)->window, &x, &y, &w, &h, NULL );
- //g_debug( "WINDOW geometry is %d, %d * %d, %d", x, y, w, h );
+ //moko_debug( "WINDOW geometry is %d, %d * %d, %d", x, y, w, h );
int absx;
int absy;
@@ -245,7 +240,7 @@
gdk_window_get_origin( GTK_WIDGET(window)->window, &absx, &absy );
GtkAllocation* alloc = >K_WIDGET(window)->allocation;
- //g_debug( "WINDOW allocation is %d, %d * %d, %d", alloc->x, alloc->y, alloc->width, alloc->height );
+ //moko_debug( "WINDOW allocation is %d, %d * %d, %d", alloc->x, alloc->y, alloc->width, alloc->height );
gtk_window_move( priv->popup, absx + w - req.width, absy + h - req.height );
}
gtk_widget_show( priv->popup );
@@ -253,7 +248,7 @@
static void moko_finger_tool_box_hide(GtkWidget* widget)
{
- g_debug( "moko_finger_tool_box_hide" );
+ moko_debug( "moko_finger_tool_box_hide" );
GTK_WIDGET_CLASS(parent_class)->hide(widget);
MokoFingerToolBoxPrivate* priv = MOKO_FINGER_TOOL_BOX_GET_PRIVATE(widget);
gtk_widget_hide( priv->popup );
@@ -265,23 +260,18 @@
MokoFingerToolBoxPrivate* priv = MOKO_FINGER_TOOL_BOX_GET_PRIVATE(self);
gtk_widget_set_name( GTK_WIDGET(self), "mokofingertoolbox" );
//FIXME get from theme
- gtk_alignment_set_padding( GTK_ALIGNMENT(self), 0, 0, OUTER_PADDING, 0 );
- priv->leftarrow = MOKO_PIXMAP_BUTTON( moko_pixmap_button_new() );
- gtk_widget_set_name( GTK_WIDGET(priv->leftarrow), "mokofingertoolbox-leftarrow" );
+ //gtk_alignment_set_padding( GTK_ALIGNMENT(self), 0, 0, OUTER_PADDING, 0 );
priv->rightarrow = MOKO_PIXMAP_BUTTON( moko_pixmap_button_new() );
gtk_widget_set_name( GTK_WIDGET(priv->rightarrow), "mokofingertoolbox-rightarrow" );
priv->hbox = gtk_hbox_new( FALSE, INNER_PADDING );
gtk_container_add( GTK_CONTAINER(self), GTK_WIDGET(priv->hbox) );
- gtk_box_pack_start( GTK_BOX(priv->hbox), priv->leftarrow, FALSE, FALSE, 0 );
gtk_box_pack_end( GTK_BOX(priv->hbox), priv->rightarrow, FALSE, FALSE, 0 );
gtk_widget_show( GTK_WIDGET(priv->hbox) );
- g_signal_connect( G_OBJECT(priv->leftarrow), "clicked", G_CALLBACK(cb_left_button_pressed), self );
g_signal_connect( G_OBJECT(priv->rightarrow), "clicked", G_CALLBACK(cb_right_button_pressed), self );
-
g_signal_connect_after( G_OBJECT(self), "size-allocate", G_CALLBACK(cb_configure), self );
//FIXME link with wheel
@@ -289,7 +279,6 @@
}
/* public API */
-
GtkWidget*
moko_finger_tool_box_new (void)
{
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-window.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-window.c 2006-11-29 09:40:13 UTC (rev 268)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-window.c 2006-11-29 09:56:11 UTC (rev 269)
@@ -25,6 +25,13 @@
#include <gtk/gtklabel.h>
#include <gtk/gtkbutton.h>
+#undef DEBUG_THIS_FILE
+#ifdef DEBUG_THIS_FILE
+#define moko_debug(fmt,...) g_debug(fmt,##__VA_ARGS__)
+#else
+#define moko_debug(fmt,...)
+#endif
+
G_DEFINE_TYPE (MokoFingerWindow, moko_finger_window, MOKO_TYPE_WINDOW)
#define MOKO_FINGER_WINDOW_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MOKO_TYPE_FINGER_WINDOW, MokoFingerWindowPriv))
@@ -51,7 +58,7 @@
static void moko_finger_window_class_init (MokoFingerWindowClass *klass)
{
- g_debug( "moko_finger_window_class_init" );
+ moko_debug( "moko_finger_window_class_init" );
GObjectClass *object_class = G_OBJECT_CLASS (klass);
g_type_class_add_private (klass, sizeof (MokoFingerWindowPriv));
@@ -62,16 +69,9 @@
static void moko_finger_window_init (MokoFingerWindow *self)
{
- g_debug( "moko_finger_window_init" );
-
+ moko_debug( "moko_finger_window_init" );
MokoFingerWindowPriv* priv = MOKO_FINGER_WINDOW_PRIVATE(self);
priv->vbox = gtk_vbox_new( FALSE, 0 );
-// priv->hbox = gtk_hbox_new( FALSE, 0 );
-// priv->scroller = gtk_button_new_with_label( "Hello" );
-// priv->label = gtk_label_new( "Yo Yo" );
-// gtk_box_pack_end( GTK_BOX(priv->vbox), GTK_WIDGET(priv->hbox), FALSE, FALSE, 0 );
-// gtk_box_pack_start( GTK_BOX(priv->hbox), GTK_WIDGET(priv->scroller), FALSE, FALSE, 0 );
-// gtk_box_pack_start( GTK_BOX(priv->hbox), GTK_WIDGET(priv->label), FALSE, FALSE, 0 );
gtk_container_add( GTK_CONTAINER(self), GTK_WIDGET(priv->vbox) );
}
@@ -82,8 +82,7 @@
void moko_finger_window_set_application_menu(MokoFingerWindow* self, GtkMenu* menu)
{
- g_debug( "moko_finger_window_set_application_menu" );
-
+ moko_debug( "moko_finger_window_set_application_menu" );
MokoFingerWindowPriv* priv = MOKO_FINGER_WINDOW_PRIVATE(self);
if (!priv->menubox )
{
@@ -93,10 +92,23 @@
moko_menu_box_set_application_menu( priv->menubox, menu );
}
-void moko_finger_window_set_contents (MokoFingerWindow* self, GtkWidget* child )
+void moko_finger_window_set_contents(MokoFingerWindow* self, GtkWidget* child)
{
- g_debug( "moko_finger_window_set_contents" );
+ moko_debug( "moko_finger_window_set_contents" );
MokoFingerWindowPriv* priv = MOKO_FINGER_WINDOW_PRIVATE(self);
gtk_box_pack_start( GTK_BOX(priv->vbox), GTK_WIDGET(child), TRUE, TRUE, 0 );
}
+
+void moko_finger_window_show_wheel(MokoFingerWindow* self)
+{
+}
+void moko_finger_window_hide_wheel(MokoFingerWindow* self)
+{
+}
+void moko_finger_window_show_tools(MokoFingerWindow* self)
+{
+}
+void moko_finger_window_hide_tools(MokoFingerWindow* self)
+{
+}
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-window.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-window.h 2006-11-29 09:40:13 UTC (rev 268)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-window.h 2006-11-29 09:56:11 UTC (rev 269)
@@ -45,7 +45,11 @@
GType moko_finger_window_get_type (void);
GtkWidget* moko_finger_window_new (void);
void moko_finger_window_set_application_menu(MokoFingerWindow* self, GtkMenu* menu);
-void moko_finger_window_set_contents (MokoFingerWindow* self, GtkWidget* child );
+void moko_finger_window_set_contents(MokoFingerWindow* self, GtkWidget* child);
+void moko_finger_window_show_wheel(MokoFingerWindow* self);
+void moko_finger_window_hide_wheel(MokoFingerWindow* self);
+void moko_finger_window_show_tools(MokoFingerWindow* self);
+void moko_finger_window_hide_tools(MokoFingerWindow* self);
G_END_DECLS
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-pixmap-button.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-pixmap-button.c 2006-11-29 09:40:13 UTC (rev 268)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-pixmap-button.c 2006-11-29 09:56:11 UTC (rev 269)
@@ -20,9 +20,17 @@
#include <gtk/gtkmenu.h>
+#undef DEBUG_THIS_FILE
+#ifdef DEBUG_THIS_FILE
+#define moko_debug(fmt,...) g_debug(fmt,##__VA_ARGS__)
+#else
+#define moko_debug(fmt,...)
+#endif
+
G_DEFINE_TYPE (MokoPixmapButton, moko_pixmap_button, GTK_TYPE_BUTTON);
#define MOKO_PIXMAP_BUTTON_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MOKO_TYPE_PIXMAP_BUTTON, MokoPixmapButtonPrivate))
+
#define CHILD_SPACING 1
typedef struct _MokoPixmapButtonPrivate
@@ -80,14 +88,14 @@
GtkTextDirection direction;
gdk_window_get_origin(GTK_BUTTON(button)->event_window, x, y);
- g_debug( "menu popup @ %d, %d", *x, *y );
+ moko_debug( "menu popup @ %d, %d", *x, *y );
*y += allocation->height;
- g_debug( "size allocate = %d, %d * %d, %d", allocation->x, allocation->y, allocation->width, allocation->height );
+ moko_debug( "size allocate = %d, %d * %d, %d", allocation->x, allocation->y, allocation->width, allocation->height );
*push_in = TRUE;
- g_debug( "menu popup @ %d, %d", *x, *y );
+ moko_debug( "menu popup @ %d, %d", *x, *y );
}
static void
@@ -111,7 +119,7 @@
static void
moko_pixmap_button_init (MokoPixmapButton *self)
{
- g_debug( "moko_pixmap_button_init" );
+ moko_debug( "moko_pixmap_button_init" );
gtk_button_set_focus_on_click( GTK_BUTTON(self), FALSE ); //FIXME probably don't need this when focus is invisible
g_object_set_property( GTK_BUTTON(self), "can-focus", FALSE ); //FIXME probably don't need this when focus is invisible
@@ -121,7 +129,7 @@
static void
moko_pixmap_button_size_request (GtkWidget *widget, GtkRequisition *requisition)
{
- g_debug( "moko_pixmap_button_size_request" );
+ moko_debug( "moko_pixmap_button_size_request" );
GtkButton *button = GTK_BUTTON (widget);
GtkBorder default_border;
GtkBorder* size_request; // modified
@@ -137,7 +145,7 @@
if ( size_request && size_request->left + size_request->right + size_request->top + size_request->bottom ) // new fixed thing
{
- g_debug( "moko_pixmap_button_size_request: style requested size = '%d x %d'", size_request->right, size_request->bottom );
+ moko_debug( "moko_pixmap_button_size_request: style requested size = '%d x %d'", size_request->right, size_request->bottom );
requisition->width = size_request->right;
requisition->height = size_request->bottom;
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-window.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-window.c 2006-11-29 09:40:13 UTC (rev 268)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-window.c 2006-11-29 09:56:11 UTC (rev 269)
@@ -63,5 +63,3 @@
{
/* destruct your widgets here */
}
-
-/* add new methods here */
More information about the commitlog
mailing list
