rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[review] force_raise -> no_raise

Browse Source
This commit is contained in:
Anton S 2017-10-10 23:02:10 +03:00
parent e1f5da3eff
commit ba1a7a8de8
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qutebrowser/app.py
View File

@ -300,24 +300,20 @@ def process_pos_args(args, via_ipc=False, cwd=None, target_arg=None):
win_id = open_url(url, target=open_target) win_id = open_url(url, target=open_target)
def open_url(url, target=None, force_raise=None): def open_url(url, target=None, no_raise=False):
"""Open an URL in new window/tab """Open an URL in new window/tab
Args: Args:
url: An URL to open url: An URL to open
target: same as new_instance_open_target (used as a default) target: same as new_instance_open_target (used as a default)
force_raise: control target window raising: no_raise: suppress target window raising
* None - obey new_instance_open_target
* True - always raise
* False - never raise
Return: Return:
ID of a window that was used to open URL ID of a window that was used to open URL
""" """
target = target or config.val.new_instance_open_target target = target or config.val.new_instance_open_target
background = target in {'tab-bg', 'tab-bg-silent'} background = target in {'tab-bg', 'tab-bg-silent'}
win_id = mainwindow.get_window(True, force_target=target, win_id = mainwindow.get_window(True, force_target=target, no_raise=no_raise)
force_raise=force_raise)
tabbed_browser = objreg.get('tabbed-browser', scope='window', tabbed_browser = objreg.get('tabbed-browser', scope='window',
window=win_id) window=win_id)
log.init.debug("About to open URL: {}".format(url.toDisplayString())) log.init.debug("About to open URL: {}".format(url.toDisplayString()))
@ -844,7 +840,7 @@ class Application(QApplication):
def event(self, e): def event(self, e):
if e.type() == QEvent.FileOpen: if e.type() == QEvent.FileOpen:
open_url(e.url(), force_raise=False) open_url(e.url(), no_raise=True)
else: else:
return super().event(e) return super().event(e)

9
qutebrowser/mainwindow/mainwindow.py
View File

@ -43,7 +43,7 @@ win_id_gen = itertools.count(0)
def get_window(via_ipc, force_window=False, force_tab=False, def get_window(via_ipc, force_window=False, force_tab=False,
force_target=None, force_raise=None): force_target=None, no_raise=False):
"""Helper function for app.py to get a window id. """Helper function for app.py to get a window id.
Args: Args:
@ -51,10 +51,7 @@ def get_window(via_ipc, force_window=False, force_tab=False,
force_window: Whether to force opening in a window. force_window: Whether to force opening in a window.
force_tab: Whether to force opening in a tab. force_tab: Whether to force opening in a tab.
force_target: Override the new_instance_open_target config force_target: Override the new_instance_open_target config
force_raise: control target window raising: no_raise: suppress target window raising
* None - obey new_instance_open_target
* True - always raise
* False - never raise
Return: Return:
ID of a window that was used to open URL ID of a window that was used to open URL
@ -91,7 +88,7 @@ def get_window(via_ipc, force_window=False, force_tab=False,
window.show() window.show()
should_raise = True should_raise = True
if (force_raise is True) or (force_raise is None and should_raise): if should_raise and not no_raise:
raise_window(window) raise_window(window)
return window.win_id return window.win_id