[dconf-editor] Make some methods static.
- From: Arnaud B. <arnaudb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dconf-editor] Make some methods static.
- Date: Wed, 19 Dec 2018 17:20:22 +0000 (UTC)
commit f5c22532317f452bd160fa80d7b893fc4d5344df
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date: Sun Dec 16 16:52:09 2018 +0100
Make some methods static.
editor/base-window.vala | 12 +++++++++---
editor/browser-window.vala | 16 +++++++++-------
2 files changed, 18 insertions(+), 10 deletions(-)
---
diff --git a/editor/base-window.vala b/editor/base-window.vala
index 2888049..73c3eb9 100644
--- a/editor/base-window.vala
+++ b/editor/base-window.vala
@@ -257,17 +257,23 @@ private class BaseWindow : AdaptativeWindow, AdaptativeWidget
[GtkCallback]
protected virtual bool on_key_press_event (Widget widget, Gdk.EventKey event)
+ {
+ return _on_key_press_event (widget, event);
+ }
+ private static bool _on_key_press_event (Widget widget, Gdk.EventKey event)
{
uint keyval = event.keyval;
string name = (!) (Gdk.keyval_name (keyval) ?? "");
if (name == "F1") // TODO fix dance done with the F1 & <Primary>F1 shortcuts that show help overlay
{
- headerbar.close_popovers ();
- base_view.close_popovers ();
+ BaseWindow _this = (BaseWindow) widget;
+
+ _this.headerbar.close_popovers ();
+ _this.base_view.close_popovers ();
if ((event.state & Gdk.ModifierType.SHIFT_MASK) == 0)
return false; // help overlay
- about ();
+ _this.about ();
return true;
}
diff --git a/editor/browser-window.vala b/editor/browser-window.vala
index 7129736..0df217b 100644
--- a/editor/browser-window.vala
+++ b/editor/browser-window.vala
@@ -650,25 +650,27 @@ private abstract class BrowserWindow : BaseWindow
"mouse-forward-button", SettingsBindFlags.GET|SettingsBindFlags.NO_SENSITIVITY);
}
- private bool on_button_press_event (Widget widget, Gdk.EventButton event)
+ private static bool on_button_press_event (Widget widget, Gdk.EventButton event)
{
- if (!mouse_use_extra_buttons)
+ BrowserWindow _this = (BrowserWindow) widget;
+
+ if (!_this.mouse_use_extra_buttons)
return false;
- if (event.button == mouse_back_button)
+ if (event.button == _this.mouse_back_button)
{
- if (mouse_back_button == mouse_forward_button)
+ if (_this.mouse_back_button == _this.mouse_forward_button)
{
warning (_("The same mouse button is set for going backward and forward. Doing nothing."));
return false;
}
- go_backward ((event.state & Gdk.ModifierType.SHIFT_MASK) != 0);
+ _this.go_backward ((event.state & Gdk.ModifierType.SHIFT_MASK) != 0);
return true;
}
- if (event.button == mouse_forward_button)
+ if (event.button == _this.mouse_forward_button)
{
- go_forward ((event.state & Gdk.ModifierType.SHIFT_MASK) != 0);
+ _this.go_forward ((event.state & Gdk.ModifierType.SHIFT_MASK) != 0);
return true;
}
return false;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]