* Update default config * Add patch to retain the visibility of the navigationbar in fullscreen mode. It can be hidden manually, the way it used to be in 0.2.0 * This closes SHR bug #768
--- .../a08caa02b95db6c9251a5342de0fb985fae8399b.patch | 39 ++++++++++++++++++++ recipes/gtk-webcore/midori/config | 11 +++++- recipes/gtk-webcore/midori_0.2.1.bb | 4 ++- 3 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 recipes/gtk-webcore/midori-0.2.1/a08caa02b95db6c9251a5342de0fb985fae8399b.patch diff --git a/recipes/gtk-webcore/midori-0.2.1/a08caa02b95db6c9251a5342de0fb985fae8399b.patch b/recipes/gtk-webcore/midori-0.2.1/a08caa02b95db6c9251a5342de0fb985fae8399b.patch new file mode 100644 index 0000000..78d8fba --- /dev/null +++ b/recipes/gtk-webcore/midori-0.2.1/a08caa02b95db6c9251a5342de0fb985fae8399b.patch @@ -0,0 +1,39 @@ +From a08caa02b95db6c9251a5342de0fb985fae8399b Mon Sep 17 00:00:00 2001 +From: Christian Dywan <[email protected]> +Date: Tue, 08 Dec 2009 22:55:25 +0000 +Subject: Retain the visibility of the navigationbar in fullscreen mode + +It can be hidden manually, the way it used to be in 0.2.0 +--- +diff --git a/midori/midori-browser.c b/midori/midori-browser.c +index 92769fd..11ca4aa 100644 +--- a/midori/midori-browser.c ++++ b/midori/midori-browser.c +@@ -3604,9 +3604,7 @@ _action_location_focus_out (GtkAction* action, + { + GtkWidget* view = midori_browser_get_current_tab (browser); + +- if (!browser->show_navigationbar +- || gdk_window_get_state (GTK_WIDGET (browser)->window) +- & GDK_WINDOW_STATE_FULLSCREEN) ++ if (!browser->show_navigationbar) + gtk_widget_hide (browser->navigationbar); + + if (g_object_get_data (G_OBJECT (view), "news-feeds")) +@@ -5148,14 +5146,11 @@ midori_browser_window_state_event_cb (MidoriBrowser* browser, + if (event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN) + { + gtk_widget_hide (browser->menubar); +- gtk_widget_hide (browser->navigationbar); + } + else + { + if (katze_object_get_boolean (browser->settings, "show-menubar")) + gtk_widget_show (browser->menubar); +- if (katze_object_get_boolean (browser->settings, "show-navigationbar")) +- gtk_widget_show (browser->navigationbar); + } + } + } +-- +cgit v0.8.2.1 diff --git a/recipes/gtk-webcore/midori/config b/recipes/gtk-webcore/midori/config index 7b6991d..49aad72 100644 --- a/recipes/gtk-webcore/midori/config +++ b/recipes/gtk-webcore/midori/config @@ -1,4 +1,13 @@ [settings] enforce-96-dpi=true -toolbar-items=Back,Forward,ReloadStop,Fullscreen,Location,Panel, +toolbar-items=Back,Forward,ReloadStop,Fullscreen,Location, +show-menubar=true +show-navigationbar=true +show-bookmarkbar=false +show-panel=false +show-transferbar=false +show-statusbar=false +zoom-text-and-images=true +open-new-pages-in=MIDORI_NEW_PAGE_WINDOW +open-external-pages-in=MIDORI_NEW_PAGE_WINDOW diff --git a/recipes/gtk-webcore/midori_0.2.1.bb b/recipes/gtk-webcore/midori_0.2.1.bb index 3eaf0f0..a935677 100644 --- a/recipes/gtk-webcore/midori_0.2.1.bb +++ b/recipes/gtk-webcore/midori_0.2.1.bb @@ -5,7 +5,9 @@ DEPENDS += "python-native python-docutils-native" SRC_URI = "http://archive.xfce.org/src/apps/midori/0.2/midori-${PV}.tar.bz2 \ file://waf" -SRC_URI_append_shr = " file://config " +SRC_URI_append_shr = " file://config \ + file://a08caa02b95db6c9251a5342de0fb985fae8399b.patch;patch=1 \ + " PR = "r1" -- 1.6.5.4 _______________________________________________ Shr-devel mailing list [email protected] http://lists.shr-project.org/mailman/listinfo/shr-devel
