[maemo-commits] [maemo-commits] r11904 - in projects/haf/trunk/hildon-home-webshortcut: . plugin

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-05-28 16:30:35 +0300 (Mon, 28 May 2007)
New Revision: 11904

Modified:
   projects/haf/trunk/hildon-home-webshortcut/ChangeLog
   projects/haf/trunk/hildon-home-webshortcut/plugin/hildon-home-webshortcut.c
Log:

2007-05-28  Johan Bilien  <johan.bilien at nokia.com>

	* plugin/hildon-home-webshortcut.c:
	- made non-resizable
	- changed size
	- added _expose handler to avoid using a GtkFrame



Modified: projects/haf/trunk/hildon-home-webshortcut/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-home-webshortcut/ChangeLog	2007-05-28 13:26:56 UTC (rev 11903)
+++ projects/haf/trunk/hildon-home-webshortcut/ChangeLog	2007-05-28 13:30:35 UTC (rev 11904)
@@ -1,3 +1,10 @@
+2007-05-28  Johan Bilien  <johan.bilien at nokia.com>
+
+	* plugin/hildon-home-webshortcut.c:
+	- made non-resizable
+	- changed size
+	- added _expose handler to avoid using a GtkFrame
+
 2007-05-09  Lucas Rocha  <lucas.rocha at nokia.com>
 
 	* debian/copyright: changed copyright holder from "Nokia Oyj" to

Modified: projects/haf/trunk/hildon-home-webshortcut/plugin/hildon-home-webshortcut.c
===================================================================
--- projects/haf/trunk/hildon-home-webshortcut/plugin/hildon-home-webshortcut.c	2007-05-28 13:26:56 UTC (rev 11903)
+++ projects/haf/trunk/hildon-home-webshortcut/plugin/hildon-home-webshortcut.c	2007-05-28 13:30:35 UTC (rev 11904)
@@ -58,8 +58,8 @@
 #define HHWS_GCONF_IAP          "/apps/osso/apps/hhws/iap"
 #define HHWS_GCONF_URI          "/apps/osso/apps/hhws/uri"
 
-#define HILDON_HOME_WS_WIDTH            290
-#define HILDON_HOME_WS_HEIGHT           134
+#define HILDON_HOME_WS_WIDTH            300
+#define HILDON_HOME_WS_HEIGHT           100
 #define HILDON_HOME_WS_MINIMUM_WIDTH    120
 #define HILDON_HOME_WS_MINIMUM_HEIGHT   60
 #define HILDON_HOME_WS_ENV_HOME "HOME"
@@ -547,6 +547,45 @@
                                                                      event);
 }
 
+static gboolean
+hhws_expose (GtkWidget         *widget,
+             GdkEventExpose    *event)
+{
+  if (GTK_WIDGET_DRAWABLE (widget))
+    {
+      gint x, y;
+
+      if (GTK_WIDGET_NO_WINDOW (widget))
+        {
+          x = widget->allocation.x;
+          y = widget->allocation.y;
+        }
+      else
+        {
+          x = 0;
+          y = 0;
+        }
+
+      gtk_paint_box (widget->style,
+                     widget->window,
+                     GTK_STATE_NORMAL,
+                     GTK_SHADOW_NONE,
+                     &event->area,
+                     widget,
+                     NULL,
+                     x,
+                     y,
+                     widget->allocation.width,
+                     widget->allocation.height
+                    );
+
+      return GTK_WIDGET_CLASS (hhws_parent_class)->expose_event (widget,
+                                                                 event);
+    }
+
+  return FALSE;
+}
+
 static void
 hhws_reload_pixbuf (Hhws *hhws)
 {
@@ -659,7 +698,6 @@
 hhws_init (Hhws *hhws)
 {
   HhwsPrivate  *priv;
-  GtkWidget    *frame;
   GtkWidget    *alignment;
   gchar        *cache_file = NULL;
 
@@ -685,8 +723,8 @@
   priv->gconf_client = gconf_client_get_default ();
   hhws_load_configuration (hhws);
 
-  gtk_widget_set_size_request (GTK_WIDGET (hhws), 
-                               HILDON_HOME_WS_WIDTH, 
+  gtk_widget_set_size_request (GTK_WIDGET (hhws),
+                               HILDON_HOME_WS_WIDTH,
                                HILDON_HOME_WS_HEIGHT);
 
   priv->image = gtk_image_new();
@@ -695,10 +733,6 @@
                             G_CALLBACK (hhws_image_size_allocate),
                             hhws);
 
-  frame = gtk_frame_new (NULL/*label*/);
-  gtk_widget_set_name (frame, "osso-speeddial"/*FIXME give it its own name*/);
-  gtk_container_set_border_width (GTK_CONTAINER (frame), 0);
-
   alignment = gtk_alignment_new (0.5,
                                  0.5,
                                  1.0,
@@ -707,12 +741,10 @@
   gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 15, 15, 15, 15);
 
   gtk_container_add (GTK_CONTAINER (alignment), priv->image);
-  gtk_container_add (GTK_CONTAINER (frame), alignment);
-  gtk_container_add (GTK_CONTAINER (hhws), frame);
+  gtk_container_add (GTK_CONTAINER (hhws), alignment);
 
   gtk_widget_show (priv->image);
   gtk_widget_show (alignment);
-  gtk_widget_show (frame);
 
   priv->csm = hhws_create_csm (hhws);
 
@@ -722,9 +754,11 @@
                                  0 /* flags, deprecated */);
 
   g_object_set (hhws,
-                "resize-type",          HILDON_DESKTOP_HOME_ITEM_RESIZE_BOTH,
+                "resize-type",          HILDON_DESKTOP_HOME_ITEM_RESIZE_NONE,
+#if 0
                 "minimum-width",        HILDON_HOME_WS_MINIMUM_WIDTH,
                 "minimum-height",       HILDON_HOME_WS_MINIMUM_HEIGHT,
+#endif
                 NULL);
 }
 
@@ -743,6 +777,7 @@
 
   widget_class->button_press_event   = hhws_button_press;
   widget_class->button_release_event = hhws_button_release;
+  widget_class->expose_event         = hhws_expose;
 
   object_class->destroy = hhws_destroy;