2007-07-14 [colin] 2.10.0cvs27
* src/mimeview.c * src/gtk/gtkvscrollbutton.c Maemo: Fix mimeview's buttons size
This commit is contained in:
parent
81f15a15ba
commit
768dd5809b
5 changed files with 23 additions and 4 deletions
|
@ -1,3 +1,9 @@
|
|||
2007-07-14 [colin] 2.10.0cvs27
|
||||
|
||||
* src/mimeview.c
|
||||
* src/gtk/gtkvscrollbutton.c
|
||||
Maemo: Fix mimeview's buttons size
|
||||
|
||||
2007-07-14 [colin] 2.10.0cvs26
|
||||
|
||||
* src/toolbar.c
|
||||
|
|
|
@ -2680,3 +2680,4 @@
|
|||
( cvs diff -u -r 1.155.2.68 -r 1.155.2.69 src/Makefile.am; cvs diff -u -r 1.204.2.139 -r 1.204.2.140 src/prefs_common.c; cvs diff -u -r 1.25.2.40 -r 1.25.2.41 src/stock_pixmap.c; cvs diff -u -r 1.18.2.29 -r 1.18.2.30 src/stock_pixmap.h; cvs diff -u -r 1.43.2.72 -r 1.43.2.73 src/toolbar.c; diff -u /dev/null src/pixmaps/go_folders.xpm; ) > 2.10.0cvs24.patchset
|
||||
( cvs diff -u -r 1.274.2.196 -r 1.274.2.197 src/mainwindow.c; cvs diff -u -r 1.43.2.73 -r 1.43.2.74 src/toolbar.c; ) > 2.10.0cvs25.patchset
|
||||
( cvs diff -u -r 1.43.2.74 -r 1.43.2.75 src/toolbar.c; ) > 2.10.0cvs26.patchset
|
||||
( cvs diff -u -r 1.83.2.109 -r 1.83.2.110 src/mimeview.c; cvs diff -u -r 1.5.2.9 -r 1.5.2.10 src/gtk/gtkvscrollbutton.c; ) > 2.10.0cvs27.patchset
|
||||
|
|
|
@ -11,7 +11,7 @@ MINOR_VERSION=10
|
|||
MICRO_VERSION=0
|
||||
INTERFACE_AGE=0
|
||||
BINARY_AGE=0
|
||||
EXTRA_VERSION=26
|
||||
EXTRA_VERSION=27
|
||||
EXTRA_RELEASE=
|
||||
EXTRA_GTK2_VERSION=
|
||||
|
||||
|
|
|
@ -122,11 +122,19 @@ static void gtk_vscrollbutton_init(GtkVScrollbutton *scrollbutton)
|
|||
arrow = gtk_arrow_new(GTK_ARROW_UP, GTK_SHADOW_NONE);
|
||||
gtk_widget_show(arrow);
|
||||
gtk_container_add(GTK_CONTAINER(scrollbutton->upbutton), arrow);
|
||||
#ifndef MAEMO
|
||||
gtk_widget_set_size_request(scrollbutton->upbutton, -1, 16);
|
||||
#else
|
||||
gtk_widget_set_size_request(scrollbutton->upbutton, -1, arrow->requisition.height + 8);
|
||||
#endif
|
||||
arrow = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_NONE);
|
||||
gtk_widget_show(arrow);
|
||||
gtk_container_add(GTK_CONTAINER(scrollbutton->downbutton), arrow);
|
||||
#ifndef MAEMO
|
||||
gtk_widget_set_size_request(scrollbutton->downbutton, -1, 16);
|
||||
#else
|
||||
gtk_widget_set_size_request(scrollbutton->downbutton, -1, arrow->requisition.height + 8);
|
||||
#endif
|
||||
GTK_WIDGET_UNSET_FLAGS(scrollbutton->upbutton, GTK_CAN_FOCUS);
|
||||
GTK_WIDGET_UNSET_FLAGS(scrollbutton->downbutton, GTK_CAN_FOCUS);
|
||||
gtk_widget_show(scrollbutton->downbutton);
|
||||
|
|
|
@ -306,7 +306,9 @@ MimeView *mimeview_create(MainWindow *mainwin)
|
|||
|
||||
gtk_widget_show(hbox);
|
||||
gtk_widget_hide(ctree_mainbox);
|
||||
|
||||
#ifdef MAEMO
|
||||
gtk_widget_set_size_request(mime_toggle, -1, arrow->requisition.height + 8);
|
||||
#endif
|
||||
mimeview->hbox = hbox;
|
||||
mimeview->paned = paned;
|
||||
mimeview->scrolledwin = scrolledwin;
|
||||
|
@ -2149,7 +2151,6 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
|
|||
OVERLAY_NONE, 6, 3);
|
||||
}
|
||||
gtk_container_add(GTK_CONTAINER(button), pixmap);
|
||||
|
||||
if (!desc) {
|
||||
if (prefs_common.attach_desc)
|
||||
desc = get_part_description(mimeinfo);
|
||||
|
@ -2203,6 +2204,10 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
|
|||
g_signal_connect(G_OBJECT(button), "drag_data_get",
|
||||
G_CALLBACK(mimeview_drag_data_get), mimeview);
|
||||
gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);
|
||||
#ifdef MAEMO
|
||||
gtk_widget_set_size_request(vbox, -1, pixmap->requisition.height + 8);
|
||||
gtk_widget_set_size_request(button, -1, pixmap->requisition.height + 4);
|
||||
#endif
|
||||
|
||||
}
|
||||
|
||||
|
@ -2311,7 +2316,6 @@ static void icon_list_create(MimeView *mimeview, MimeInfo *mimeinfo)
|
|||
gtk_widget_set_size_request(mimeview->icon_mainbox,
|
||||
size.width, -1);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
static void mime_toggle_button_cb (GtkWidget *button, MimeView *mimeview)
|
||||
|
|
Loading…
Reference in a new issue