From d6bb64d84872c1ce527e4ca75d5f133c3991a0b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Fri, 8 Feb 2013 00:52:16 +0100 Subject: [PATCH] app_server: Added NormalMouse() and ClickToFocusMouse() methods. * Made FocusFollowsMouse() inline. * For convenience only. --- src/servers/app/DesktopSettings.cpp | 16 +--------------- src/servers/app/DesktopSettings.h | 11 ++++++++++- src/servers/app/DesktopSettingsPrivate.h | 11 +++++++++-- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/servers/app/DesktopSettings.cpp b/src/servers/app/DesktopSettings.cpp index 6c3a0d297d..f5660b914b 100644 --- a/src/servers/app/DesktopSettings.cpp +++ b/src/servers/app/DesktopSettings.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2005-2009, Haiku. + * Copyright 2005-2013, Haiku. * Distributed under the terms of the MIT License. * * Authors: @@ -578,13 +578,6 @@ DesktopSettingsPrivate::AcceptFirstClick() const } -bool -DesktopSettingsPrivate::FocusFollowsMouse() const -{ - return MouseMode() == B_FOCUS_FOLLOWS_MOUSE; -} - - void DesktopSettingsPrivate::SetShowAllDraggers(bool show) { @@ -816,13 +809,6 @@ DesktopSettings::FocusFollowsMouseMode() const } -bool -DesktopSettings::FocusFollowsMouse() const -{ - return fSettings->FocusFollowsMouse(); -} - - bool DesktopSettings::AcceptFirstClick() const { diff --git a/src/servers/app/DesktopSettings.h b/src/servers/app/DesktopSettings.h index d6b7345fd3..77d16569c3 100644 --- a/src/servers/app/DesktopSettings.h +++ b/src/servers/app/DesktopSettings.h @@ -47,7 +47,16 @@ public: mode_mouse MouseMode() const; mode_focus_follows_mouse FocusFollowsMouseMode() const; - bool FocusFollowsMouse() const; + + bool NormalMouse() const + { return MouseMode() == B_NORMAL_MOUSE; } + bool FocusFollowsMouse() const + { return MouseMode() + == B_FOCUS_FOLLOWS_MOUSE; } + bool ClickToFocusMouse() const + { return MouseMode() + == B_CLICK_TO_FOCUS_MOUSE; } + bool AcceptFirstClick() const; bool ShowAllDraggers() const; diff --git a/src/servers/app/DesktopSettingsPrivate.h b/src/servers/app/DesktopSettingsPrivate.h index 3894dca2f8..71b7519adb 100644 --- a/src/servers/app/DesktopSettingsPrivate.h +++ b/src/servers/app/DesktopSettingsPrivate.h @@ -1,5 +1,5 @@ /* - * Copyright 2005-2009, Haiku. + * Copyright 2005-2013, Haiku. * Distributed under the terms of the MIT License. * * Authors: @@ -48,7 +48,14 @@ public: void SetFocusFollowsMouseMode( mode_focus_follows_mouse mode); mode_focus_follows_mouse FocusFollowsMouseMode() const; - bool FocusFollowsMouse() const; + bool NormalMouse() const + { return MouseMode() == B_NORMAL_MOUSE; } + bool FocusFollowsMouse() const + { return MouseMode() + == B_FOCUS_FOLLOWS_MOUSE; } + bool ClickToFocusMouse() const + { return MouseMode() + == B_CLICK_TO_FOCUS_MOUSE; } void SetAcceptFirstClick(bool acceptFirstClick); bool AcceptFirstClick() const;