aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk/MenuTheme.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/FbTk/MenuTheme.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/FbTk/MenuTheme.hh')
-rw-r--r--src/FbTk/MenuTheme.hh4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/FbTk/MenuTheme.hh b/src/FbTk/MenuTheme.hh
index c10615b..eb19798 100644
--- a/src/FbTk/MenuTheme.hh
+++ b/src/FbTk/MenuTheme.hh
@@ -107,7 +107,7 @@ public:
107 unsigned int bevelWidth() const { return *m_bevel_width; } 107 unsigned int bevelWidth() const { return *m_bevel_width; }
108 108
109 unsigned char alpha() const { return m_alpha; } 109 unsigned char alpha() const { return m_alpha; }
110 void setAlpha(unsigned char alpha) { m_alpha = alpha; } 110 void setAlpha(int alpha) { m_alpha = alpha; }
111 // this isn't actually a theme item 111 // this isn't actually a theme item
112 // but we'll let it be here for now, until there's a better way to 112 // but we'll let it be here for now, until there's a better way to
113 // get resources into menu 113 // get resources into menu
@@ -154,7 +154,7 @@ private:
154 Display *m_display; 154 Display *m_display;
155 GContext t_text_gc, f_text_gc, u_text_gc, h_text_gc, d_text_gc, hilite_gc; 155 GContext t_text_gc, f_text_gc, u_text_gc, h_text_gc, d_text_gc, hilite_gc;
156 156
157 unsigned char m_alpha; 157 int m_alpha;
158 unsigned int m_delay; ///< in msec 158 unsigned int m_delay; ///< in msec
159 unsigned int m_real_title_height; ///< the calculated item height (from font and menu.titleHeight) 159 unsigned int m_real_title_height; ///< the calculated item height (from font and menu.titleHeight)
160 unsigned int m_real_item_height; ///< the calculated item height (from font and menu.itemHeight) 160 unsigned int m_real_item_height; ///< the calculated item height (from font and menu.itemHeight)