Updating branch refs/heads/ristretto-0.0 to 90a0d52283c57eafc4c49e2065883a4828580e65 (commit) from 20f7ffbc978263b6dff3a6ac5040909a38f9b402 (commit)
commit 90a0d52283c57eafc4c49e2065883a4828580e65 Author: Stephan Arts <step...@xfce.org> Date: Fri May 1 10:37:26 2009 +0200 Make sure sticky does not break the visibility of the fs-toolbar ChangeLog | 10 +++++----- src/main_window.c | 21 ++++++++++++++------- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index b8c1401..da3a23e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,29 +1,30 @@ +2009-05-01 Stephan Arts <step...@xfce.org> + + * src/main_window.c: Make sure the fullscreen-toolbar gets shown in + fullscreen mode when ristretto left fullscreen with sticky set. + 2009-04-30 Stephan Arts <step...@xfce.org> * src/picture_viewer.c: Implement a hack to check if the pixbuf has been rotated. - 2009-04-30 Stephan Arts <step...@xfce.org> * src/main_window.c src/main_window_ui.xml: Add Sticky button to the fullscreen-toolbar. - 2009-04-30 Stephan Arts <step...@xfce.org> * src/main_window.c src/main_window_ui.xml: Set is_important hint on 'leave-fullscreen' toolitem. - 2009-04-30 Stephan Arts <step...@xfce.org> * src/main_window.c src/main_window_ui.xml: Add 'fullscreen-toolbar' with controls when in fullscreen-mode. - 2009-04-30 Stephan Arts <step...@xfce.org> * src/main_window.c @@ -31,7 +32,6 @@ src/picture_viewer.h: Let the pictureviewer figure out the fullscreen- state of it's parent-window by itself - 2009-04-28 Stephan Arts <step...@xfce.org> * src/image.c diff --git a/src/main_window.c b/src/main_window.c index adb5711..c308fd0 100644 --- a/src/main_window.c +++ b/src/main_window.c @@ -984,6 +984,7 @@ cb_rstto_main_window_open_folder (GtkWidget *widget, RsttoMainWindow *window) GFileEnumerator *file_enumarator = NULL; GFileInfo *file_info = NULL; const gchar *filename = NULL; + const gchar *content_type = NULL; gchar *uri = NULL; GValue current_uri_val = {0, }; @@ -1003,12 +1004,15 @@ cb_rstto_main_window_open_folder (GtkWidget *widget, RsttoMainWindow *window) gtk_widget_hide(dialog); file = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (dialog)); - file_enumarator = g_file_enumerate_children (file, "standard::name", 0, NULL, NULL); + file_enumarator = g_file_enumerate_children (file, "standard::*", 0, NULL, NULL); while (file_info = g_file_enumerator_next_file (file_enumarator, NULL, NULL)) { filename = g_file_info_get_name (file_info); + content_type = g_file_info_get_content_type (file_info); child_file = g_file_get_child (file, filename); + g_debug ("%s", content_type); + rstto_navigator_add_file (window->priv->props.navigator, child_file, NULL); g_object_unref (child_file); @@ -1526,16 +1530,19 @@ cb_rstto_main_window_picture_viewer_motion_notify_event (RsttoPictureViewer *vie RsttoMainWindow *window = RSTTO_MAIN_WINDOW (user_data); if(gdk_window_get_state(GTK_WIDGET(window)->window) & GDK_WINDOW_STATE_FULLSCREEN) { - if (event->state == 0 && (window->priv->fs_toolbar_sticky == FALSE)) + if (event->state == 0) { - /* TODO: implement timer to hide it again */ gtk_widget_show (window->priv->fs_toolbar); - if (window->priv->show_fs_toolbar_timeout_id > 0) + + if (window->priv->fs_toolbar_sticky == FALSE) { - g_source_remove (window->priv->show_fs_toolbar_timeout_id); - window->priv->show_fs_toolbar_timeout_id = 0; + if (window->priv->show_fs_toolbar_timeout_id > 0) + { + g_source_remove (window->priv->show_fs_toolbar_timeout_id); + window->priv->show_fs_toolbar_timeout_id = 0; + } + window->priv->show_fs_toolbar_timeout_id = g_timeout_add (3000, (GSourceFunc)cb_rstto_main_window_show_fs_toolbar_timeout, window); } - window->priv->show_fs_toolbar_timeout_id = g_timeout_add (3000, (GSourceFunc)cb_rstto_main_window_show_fs_toolbar_timeout, window); } } } _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits