aboutsummaryrefslogtreecommitdiff
path: root/src/WindowMenuAccessor.hh
diff options
context:
space:
mode:
authorMathias Gumz <akira at fluxbox dot org>2011-02-22 21:07:39 (GMT)
committerMathias Gumz <akira at fluxbox dot org>2011-02-22 21:07:39 (GMT)
commitd11aa42ace928efc3dd1eebc8988b6bbbc005b2b (patch)
tree0574ed4eaa5092386d3cf5440c636ea586baaebe /src/WindowMenuAccessor.hh
parentb7e84104a695bb3628e482c4be93f6f516e46e7d (diff)
downloadfluxbox_pavel-d11aa42ace928efc3dd1eebc8988b6bbbc005b2b.zip
fluxbox_pavel-d11aa42ace928efc3dd1eebc8988b6bbbc005b2b.tar.bz2
bugfix: consistent use of 'int' for alpha values (#3187373)
WindowMenuAccessor returned strange alpha values if compiled with 'g++ -Os'; unholy black magic happens if template<int> faces functions returning only 'usigned char'.
Diffstat (limited to 'src/WindowMenuAccessor.hh')
-rw-r--r--src/WindowMenuAccessor.hh4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/WindowMenuAccessor.hh b/src/WindowMenuAccessor.hh
index 91994b9..383923b 100644
--- a/src/WindowMenuAccessor.hh
+++ b/src/WindowMenuAccessor.hh
@@ -37,7 +37,9 @@ public:
37 37
38 operator Ret() const { 38 operator Ret() const {
39 FluxboxWindow *fbwin = FbMenu::window(); 39 FluxboxWindow *fbwin = FbMenu::window();
40 return fbwin ? (fbwin->*m_getter)() : m_def; 40 if (fbwin)
41 return (Ret)(fbwin->*m_getter)();
42 return m_def;
41 } 43 }
42 FbTk::Accessor<Ret> &operator =(const Ret &val) { 44 FbTk::Accessor<Ret> &operator =(const Ret &val) {
43 FluxboxWindow *fbwin = FbMenu::window(); 45 FluxboxWindow *fbwin = FbMenu::window();