From 9a8f94f8fcc19a7849754875c291cfe1e3ddecc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Thu, 9 Jul 2015 13:16:19 +0200 Subject: [PATCH] Workspace::gotFocusIn and ::shouldGetFocusIn changed to operate on AbstractClient --- activation.cpp | 6 +++--- workspace.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/activation.cpp b/activation.cpp index 08f380c93e..96abd51ced 100644 --- a/activation.cpp +++ b/activation.cpp @@ -526,9 +526,9 @@ void Workspace::setCurrentScreen(int new_screen) screens()->setCurrent(new_screen); } -void Workspace::gotFocusIn(const Client* c) +void Workspace::gotFocusIn(const AbstractClient* c) { - if (should_get_focus.contains(const_cast< Client* >(c))) { + if (should_get_focus.contains(const_cast< AbstractClient* >(c))) { // remove also all sooner elements that should have got FocusIn, // but didn't for some reason (and also won't anymore, because they were sooner) while (should_get_focus.first() != c) @@ -537,7 +537,7 @@ void Workspace::gotFocusIn(const Client* c) } } -void Workspace::setShouldGetFocus(Client* c) +void Workspace::setShouldGetFocus(AbstractClient* c) { should_get_focus.append(c); updateStackingOrder(); // e.g. fullscreens have different layer when active/not-active diff --git a/workspace.h b/workspace.h index 1132140403..0da4db72ac 100644 --- a/workspace.h +++ b/workspace.h @@ -160,8 +160,8 @@ public: bool allowClientActivation(const AbstractClient* c, xcb_timestamp_t time = -1U, bool focus_in = false, bool ignore_desktop = false); void restoreFocus(); - void gotFocusIn(const Client*); - void setShouldGetFocus(Client*); + void gotFocusIn(const AbstractClient*); + void setShouldGetFocus(AbstractClient*); bool activateNextClient(AbstractClient* c); bool focusChangeEnabled() { return block_focus == 0;