[dconf-editor] Remove a method.
- From: Arnaud B. <arnaudb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dconf-editor] Remove a method.
- Date: Wed, 19 Dec 2018 17:21:28 +0000 (UTC)
commit 167cafabc6e8e4c306449a4c0e9f4052234dadc8
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date: Wed Dec 19 18:02:12 2018 +0100
Remove a method.
editor/browser-window.vala | 23 ++++++++++-------------
1 file changed, 10 insertions(+), 13 deletions(-)
---
diff --git a/editor/browser-window.vala b/editor/browser-window.vala
index 513b73b..856a16a 100644
--- a/editor/browser-window.vala
+++ b/editor/browser-window.vala
@@ -283,15 +283,6 @@ private abstract class BrowserWindow : BaseWindow
return main_view.is_in_in_window_mode ();
}
- private bool navigation_blocked (bool allow_search)
- {
- if (!allow_search && headerbar.search_mode_enabled)
- return true;
- if (main_view.is_in_in_window_mode ())
- return true;
- return false;
- }
-
protected bool row_action_blocked ()
{
if (headerbar.has_popover ())
@@ -328,7 +319,7 @@ private abstract class BrowserWindow : BaseWindow
private void go_backward (bool shift)
{
- if (navigation_blocked (/* allow search */ true))
+ if (is_in_in_window_mode ())
return;
headerbar.close_popovers (); // by symmetry with go_forward()
@@ -353,12 +344,18 @@ private abstract class BrowserWindow : BaseWindow
private void go_forward (bool shift)
{
- if (navigation_blocked (/* allow search */ false))
+ if (is_in_in_window_mode ())
return;
headerbar.close_popovers ();
main_view.close_popovers ();
+ if (main_view.current_view == ViewType.SEARCH)
+ {
+ request_search (false, PathEntry.SearchMode.EDIT_PATH_MOVE_END); // TODO when (!shift), move
at next ‘/’
+ return;
+ }
+
string fallback_path;
string complete_path;
headerbar.get_fallback_path_and_complete_path (out fallback_path, out complete_path);
@@ -502,7 +499,7 @@ private abstract class BrowserWindow : BaseWindow
private void edit_path_end (/* SimpleAction action, Variant? variant */)
{
- if (navigation_blocked (/* allow search */ true))
+ if (is_in_in_window_mode ())
return;
request_search (true, PathEntry.SearchMode.EDIT_PATH_MOVE_END);
@@ -510,7 +507,7 @@ private abstract class BrowserWindow : BaseWindow
private void edit_path_last (/* SimpleAction action, Variant? variant */)
{
- if (navigation_blocked (/* allow search */ true))
+ if (is_in_in_window_mode ())
return;
request_search (true, PathEntry.SearchMode.EDIT_PATH_SELECT_LAST_WORD);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]