svnno****@sourc*****
svnno****@sourc*****
Wed Jan 21 14:08:47 JST 2009
Revision: 3533
http://svn.sourceforge.jp/view?root=kazehakase&view=rev&rev=3533
Author: ikezoe
Date: 2009-01-21 14:08:46 +0900 (Wed, 21 Jan 2009)
Log Message:
-----------
2009-01-21 Hiroyuki Ikezoe <poinc****@ikezo*****>
* src/kz-tab-label.c: Remove redundant gtk_icon_size_lookup.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/src/kz-tab-label.c
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2009-01-21 04:51:01 UTC (rev 3532)
+++ kazehakase/trunk/ChangeLog 2009-01-21 05:08:46 UTC (rev 3533)
@@ -1,3 +1,7 @@
+2009-01-21 Hiroyuki Ikezoe <poinc****@ikezo*****>
+
+ * src/kz-tab-label.c: Remove redundant gtk_icon_size_lookup.
+
2009-01-20 Hiroyuki Ikezoe <poinc****@ikezo*****>
* src/main.c: Move variable declaration to head of the function.
Modified: kazehakase/trunk/src/kz-tab-label.c
===================================================================
--- kazehakase/trunk/src/kz-tab-label.c 2009-01-21 04:51:01 UTC (rev 3532)
+++ kazehakase/trunk/src/kz-tab-label.c 2009-01-21 05:08:46 UTC (rev 3533)
@@ -53,6 +53,8 @@
gboolean javascript;
guint auto_refresh_id;
gulong favicon_signal;
+ gint icon_width;
+ gint icon_height;
};
#define KZ_TAB_LABEL_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), KZ_TYPE_TAB_LABEL, KzTabLabelPrivate))
@@ -184,7 +186,6 @@
GtkWidget *close_image, *hbox;
GtkRcStyle *style;
GtkRequisition size;
- gint width, height;
KzTabLabelPrivate *priv = KZ_TAB_LABEL_GET_PRIVATE (kztab);
kztab->kz = NULL;
@@ -230,8 +231,8 @@
gtk_widget_show (kztab->label);
/* favicon */
- gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &width, &height);
- gtk_widget_set_size_request(kztab->favicon, width, height);
+ gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &priv->icon_width, &priv->icon_height);
+ gtk_widget_set_size_request(kztab->favicon, priv->icon_width, priv->icon_height);
/* close button */
gtk_button_set_relief(GTK_BUTTON(kztab->close_button), GTK_RELIEF_NONE);
@@ -788,27 +789,26 @@
make_progress_circle(GtkWidget *widget)
{
GdkGC *gc;
- gint width, height;
GdkColormap *colormap;
KzTabLabel *kztab = KZ_TAB_LABEL(widget);
+ KzTabLabelPrivate *priv = KZ_TAB_LABEL_GET_PRIVATE(kztab);
- gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &width, &height);
kztab->circle = gdk_pixmap_new(widget->window,
- width, height, -1);
+ priv->icon_width, priv->icon_height, -1);
kztab->mask = gdk_pixmap_new(widget->window,
- width, height, 1);
+ priv->icon_width, priv->icon_height, 1);
gc = gdk_gc_new(kztab->mask);
gdk_draw_rectangle(kztab->mask,
gc,
TRUE,
0, 0,
- width, height);
+ priv->icon_width, priv->icon_height);
gdk_gc_set_function(gc, GDK_INVERT);
gdk_draw_arc(kztab->mask,
gc,
TRUE,
0, 0,
- width, height,
+ priv->icon_width, priv->icon_height,
90 * 64, 360 * 64);
g_object_unref(gc);
@@ -820,12 +820,12 @@
widget->style->white_gc,
TRUE,
0, 0,
- width, height);
+ priv->icon_width, priv->icon_height);
gdk_draw_arc(kztab->circle,
gc,
TRUE,
0, 0,
- width, height,
+ priv->icon_width, priv->icon_height,
90 * 64, 360 * 64);
g_object_unref(colormap);
g_object_unref(gc);
@@ -979,29 +979,28 @@
if(GTK_WIDGET_REALIZED(widget))
{
GdkBitmap *mask;
- gint width, height;
- gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &width, &height);
+ KzTabLabelPrivate *priv = KZ_TAB_LABEL_GET_PRIVATE(kztab);
mask = gdk_pixmap_new(widget->window,
- width, height, 1);
+ priv->icon_width, priv->icon_height, 1);
gc = gdk_gc_new(mask);
gdk_draw_rectangle(mask,
gc,
TRUE,
0, 0,
- width, height);
+ priv->icon_width, priv->icon_height);
gdk_gc_set_function(gc, GDK_INVERT);
gdk_draw_rectangle(mask,
gc,
TRUE,
0, 0,
- width, height);
+ priv->icon_width, priv->icon_height);
gdk_gc_set_function(gc, GDK_COPY);
gdk_draw_arc(mask,
gc,
TRUE,
0, 0,
- width, height,
+ priv->icon_width, priv->icon_height,
90 * 64, 360 * 64 * progress);
gdk_gc_set_function(gc, GDK_AND);
gdk_draw_drawable(mask,