r477 - trunk/src/target/OM-2007/openmoko-libs/libmokoui
tony_guan at gta01.hmw-consulting.de
tony_guan at gta01.hmw-consulting.de
Fri Dec 29 10:08:43 CET 2006
Author: tony_guan
Date: 2006-12-29 09:53:43 +0100 (Fri, 29 Dec 2006)
New Revision: 477
Modified:
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-application.c
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.h
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-wheel.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-wheel.h
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-window.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-window.c
Log:
Added a parent pointer to wheel and toolbox
line, and those below, will be ignored--
M openmoko-libs/libmokoui/moko-window.c
M openmoko-libs/libmokoui/moko-finger-tool-box.c
M openmoko-libs/libmokoui/moko-finger-wheel.c
M openmoko-libs/libmokoui/moko-finger-window.c
M openmoko-libs/libmokoui/moko-finger-tool-box.h
M openmoko-libs/libmokoui/moko-finger-wheel.h
M openmoko-libs/libmokoui/moko-application.c
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-application.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-application.c 2006-12-29 08:24:16 UTC (rev 476)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-application.c 2006-12-29 08:53:43 UTC (rev 477)
@@ -29,12 +29,13 @@
#include <stdarg.h>
-#define DEBUG_THIS_FILE
+#undef DEBUG_THIS_FILE
#ifdef DEBUG_THIS_FILE
#define moko_debug(fmt,...) g_debug(fmt,##__VA_ARGS__)
#define moko_debug_minder(predicate) moko_debug( __FUNCTION__ ); g_return_if_fail(predicate)
#else
#define moko_debug(fmt,...)
+#define moko_debug_minder(predicate) moko_debug( __FUNCTION__ ); g_return_if_fail(predicate)
#endif
G_DEFINE_TYPE (MokoApplication, moko_application, G_TYPE_OBJECT)
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-12-29 08:24:16 UTC (rev 476)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-tool-box.c 2006-12-29 08:53:43 UTC (rev 477)
@@ -23,7 +23,7 @@
#include <gtk/gtkhbox.h>
-#define DEBUG_THIS_FILE
+//#define DEBUG_THIS_FILE
#ifdef DEBUG_THIS_FILE
#define moko_debug(fmt,...) g_debug(fmt,##__VA_ARGS__)
#define moko_debug_minder(predicate) moko_debug( __FUNCTION__ ); g_return_if_fail(predicate)
@@ -54,6 +54,7 @@
guint buttonWidth;
GtkWindow* popup;
+ GtkWidget* parent;
} MokoFingerToolBoxPrivate;
@@ -231,7 +232,8 @@
gtk_container_add( GTK_CONTAINER(priv->popup), widget );
}
- MokoWindow* window = moko_application_get_main_window( moko_application_get_instance() );
+ MokoWindow* window =(MokoWindow* )(priv->parent);
+
g_return_if_fail( MOKO_IS_FINGER_WINDOW(window) );
//FIXME set also transient for all other windows belonging to this app?
gtk_window_set_transient_for( priv->popup, window );
@@ -278,9 +280,13 @@
/* public API */
GtkWidget*
-moko_finger_tool_box_new(void)
+moko_finger_tool_box_new(GtkWidget* parent)
{
- return GTK_WIDGET(g_object_new(moko_finger_tool_box_get_type(), NULL));
+ MokoFingerToolBox* self=g_object_new(moko_finger_tool_box_get_type(), NULL);
+
+ MokoFingerToolBoxPrivate* priv = MOKO_FINGER_TOOL_BOX_GET_PRIVATE(self);
+ priv->parent=parent;
+ return GTK_WIDGET(self);
}
GtkButton*
@@ -327,4 +333,4 @@
gtk_widget_queue_draw( priv->hbox );
return b;
-}
\ No newline at end of file
+}
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-tool-box.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-tool-box.h 2006-12-29 08:24:16 UTC (rev 476)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-tool-box.h 2006-12-29 08:53:43 UTC (rev 477)
@@ -44,7 +44,7 @@
GType moko_finger_tool_box_get_type (void);
-GtkWidget* moko_finger_tool_box_new (void);
+GtkWidget* moko_finger_tool_box_new ( GtkWidget* parent);
GtkButton* moko_finger_tool_box_add_button(MokoFingerToolBox* self);
GtkButton* moko_finger_tool_box_add_button_without_label(MokoFingerToolBox* self);
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-wheel.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-wheel.c 2006-12-29 08:24:16 UTC (rev 476)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-wheel.c 2006-12-29 08:53:43 UTC (rev 477)
@@ -54,6 +54,7 @@
typedef struct _MokoFingerWheelPrivate
{
GtkWindow* popup;
+ GtkWidget* parent;
} MokoFingerWheelPrivate;
/* forward declarations */
@@ -167,13 +168,21 @@
self->area_id = LAST_SIGNAL;
gtk_widget_set_name( GTK_WIDGET(self), "mokofingerwheel" );
}
-
+/*
GtkWidget*
moko_finger_wheel_new(void)
{
return GTK_WIDGET(g_object_new(moko_finger_wheel_get_type(), NULL));
}
-
+*/
+GtkWidget*
+moko_finger_wheel_new(GtkWidget* parent)
+{
+ GtkWidget* wheel=g_object_new(moko_finger_wheel_get_type(), NULL);
+ MokoFingerWheelPrivate* priv = MOKO_FINGER_WHEEL_GET_PRIVATE(wheel);
+ priv->parent=parent;
+ return wheel;
+}
static void
moko_finger_wheel_realize(GtkWidget *widget)
{
@@ -217,7 +226,8 @@
MokoWindow* window = moko_application_get_main_window( moko_application_get_instance() );
//FIXME check if it's a finger window
//FIXME set it not only transient for the main window, but also for other windows belonging to this application
- gtk_window_set_transient_for(priv->popup, window );
+// gtk_window_set_transient_for(priv->popup, window );
+ gtk_window_set_transient_for(priv->popup, priv->parent );
GtkAllocation geometry;
gboolean valid = moko_finger_window_get_geometry_hint( window, widget, &geometry );
@@ -236,10 +246,10 @@
gtk_widget_show( priv->popup );
/* resize FingerToolBox, if visible */
- MokoWindow* window = moko_application_get_main_window( moko_application_get_instance() );
- if ( MOKO_IS_FINGER_WINDOW(window) )
+// MokoWindow* window = moko_application_get_main_window( moko_application_get_instance() );
+ if ( MOKO_IS_FINGER_WINDOW(priv->parent ) )
{
- MokoFingerToolBox* toolbox = moko_finger_window_get_toolbox( MOKO_FINGER_WINDOW(window) );
+ MokoFingerToolBox* toolbox = moko_finger_window_get_toolbox( priv->parent );
if ( GTK_WIDGET_VISIBLE(toolbox) )
{
moko_debug( "moko_finger_wheel: toolbox is visible, sending resize" );
@@ -265,7 +275,8 @@
gtk_widget_hide( priv->popup );
/* resize FingerToolBox, if visible */
- MokoWindow* window = moko_application_get_main_window( moko_application_get_instance() );
+ MokoWindow* window =(MokoWindow* )(priv->parent);
+
if ( MOKO_IS_FINGER_WINDOW(window) )
{
MokoFingerToolBox* toolbox = moko_finger_window_get_toolbox( MOKO_FINGER_WINDOW(window) );
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-wheel.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-wheel.h 2006-12-29 08:24:16 UTC (rev 476)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-wheel.h 2006-12-29 08:53:43 UTC (rev 477)
@@ -48,7 +48,7 @@
} MokoFingerWheelClass;
GType moko_finger_wheel_get_type();
-GtkWidget* moko_finger_wheel_new();
+GtkWidget* moko_finger_wheel_new(GtkWidget * parent);
void moko_finger_wheel_raise(MokoFingerWheel* self);
G_END_DECLS
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-12-29 08:24:16 UTC (rev 476)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-window.c 2006-12-29 08:53:43 UTC (rev 477)
@@ -25,8 +25,12 @@
#include <gtk/gtklabel.h>
#include <gtk/gtkbutton.h>
-#define DEBUG_THIS_FILE
+//#define DEBUG_THIS_FILE
#ifdef DEBUG_THIS_FILE
+#undef DEBUG_THIS_FILE
+#endif
+
+#ifdef DEBUG_THIS_FILE
#define moko_debug(fmt,...) g_debug(fmt,##__VA_ARGS__)
#define moko_debug_minder(predicate) moko_debug( __FUNCTION__ ); g_return_if_fail(predicate)
#else
@@ -105,7 +109,7 @@
{
moko_debug( "moko_finger_window_get_wheel" );
MokoFingerWindowPriv* priv = MOKO_FINGER_WINDOW_PRIVATE(self);
- if (!priv->wheel) priv->wheel = moko_finger_wheel_new();
+ if (!priv->wheel) priv->wheel = moko_finger_wheel_new(self);
return priv->wheel;
}
@@ -113,7 +117,7 @@
{
moko_debug( "moko_finger_window_get_toolbox" );
MokoFingerWindowPriv* priv = MOKO_FINGER_WINDOW_PRIVATE(self);
- if (!priv->tools) priv->tools = moko_finger_tool_box_new();
+ if (!priv->tools) priv->tools = moko_finger_tool_box_new(self);
return priv->tools;
}
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-window.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-window.c 2006-12-29 08:24:16 UTC (rev 476)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-window.c 2006-12-29 08:53:43 UTC (rev 477)
@@ -30,7 +30,8 @@
#include <X11/Xlib.h>
#include <X11/Xatom.h>
-#define DEBUG_THIS_FILE
+//#define DEBUG_THIS_FILE
+#undef DEBUG_THIS_FILE
#ifdef DEBUG_THIS_FILE
#define moko_debug(fmt,...) g_debug(fmt,##__VA_ARGS__)
#define moko_debug_minder(predicate) moko_debug( __FUNCTION__ ); g_return_if_fail(predicate)
More information about the commitlog
mailing list