summaryrefslogtreecommitdiff
path: root/plugins/switcher
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2009-12-07 15:04:38 +0100
committerDanny Baumann <dannybaumann@web.de>2009-12-07 15:04:38 +0100
commite3ae79832d143ecbd159c427b87dbd758b671a02 (patch)
tree890763124391bfbf656c5b07b61c0f4273d02c02 /plugins/switcher
parent44c13ae631fa9290a027d956a5b5a43084abd24f (diff)
downloadcompiz-with-glib-mainloop-e3ae79832d143ecbd159c427b87dbd758b671a02.tar.gz
compiz-with-glib-mainloop-e3ae79832d143ecbd159c427b87dbd758b671a02.tar.bz2
Consolidate icon related functions and move them to window class.
Diffstat (limited to 'plugins/switcher')
-rw-r--r--plugins/switcher/src/switcher.cpp15
-rw-r--r--plugins/switcher/src/switcher.h5
2 files changed, 10 insertions, 10 deletions
diff --git a/plugins/switcher/src/switcher.cpp b/plugins/switcher/src/switcher.cpp
index bf55433..2fe9b22 100644
--- a/plugins/switcher/src/switcher.cpp
+++ b/plugins/switcher/src/switcher.cpp
@@ -124,16 +124,15 @@ SwitchWindow::damageRect (bool initial, const CompRect &rect)
return BaseSwitchWindow::damageRect (initial, rect);
}
-bool
-SwitchScreen::shouldShowIcon ()
+BaseSwitchWindow::IconMode
+SwitchWindow::getIconMode ()
{
- return optionGetIcon ();
-}
+ if (sScreen->optionGetIconOnly ())
+ return ShowIconOnly;
+ if (!sScreen->optionGetIcon ())
+ return HideIcon;
-bool
-SwitchScreen::showIconOnly ()
-{
- return optionGetIconOnly ();
+ return ShowIcon;
}
void
diff --git a/plugins/switcher/src/switcher.h b/plugins/switcher/src/switcher.h
index 11d8dd9..562d07a 100644
--- a/plugins/switcher/src/switcher.h
+++ b/plugins/switcher/src/switcher.h
@@ -62,8 +62,7 @@ class SwitchScreen :
void updateWindowList (int count);
void createWindowList (int count);
- bool shouldShowIcon ();
- bool showIconOnly ();
+
void getMinimizedAndMatch (bool &minimizedOption,
CompMatch *&match);
void switchToWindow (bool toNext);
@@ -135,6 +134,8 @@ class SwitchWindow :
float width,
float height);
+ IconMode getIconMode ();
+
SwitchScreen *sScreen;
};