diff options
Diffstat (limited to 'src/FbWinFrame.hh')
-rw-r--r-- | src/FbWinFrame.hh | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/FbWinFrame.hh b/src/FbWinFrame.hh index ff8df83..503317a 100644 --- a/src/FbWinFrame.hh +++ b/src/FbWinFrame.hh | |||
@@ -155,9 +155,9 @@ public: | |||
155 | //move the first label button to the right of the second | 155 | //move the first label button to the right of the second |
156 | void moveLabelButtonRightOf(FbTk::TextButton &btn, const FbTk::TextButton &dest); | 156 | void moveLabelButtonRightOf(FbTk::TextButton &btn, const FbTk::TextButton &dest); |
157 | /// which button is to be rendered focused | 157 | /// which button is to be rendered focused |
158 | void setLabelButtonFocus(FbTk::TextButton &btn); | 158 | void setLabelButtonFocus(IconButton &btn); |
159 | /// specify focus state of button | 159 | /// specify focus state of button |
160 | void setLabelButtonFocus(FbTk::TextButton &btn, bool value); | 160 | void setLabelButtonFocus(IconButton &btn, bool value); |
161 | /// attach a client window for client area | 161 | /// attach a client window for client area |
162 | void setClientWindow(FbTk::FbWindow &win); | 162 | void setClientWindow(FbTk::FbWindow &win); |
163 | /// remove attached client window | 163 | /// remove attached client window |
@@ -233,7 +233,7 @@ public: | |||
233 | inline FbTk::FbWindow &gripLeft() { return m_grip_left; } | 233 | inline FbTk::FbWindow &gripLeft() { return m_grip_left; } |
234 | inline const FbTk::FbWindow &gripRight() const { return m_grip_right; } | 234 | inline const FbTk::FbWindow &gripRight() const { return m_grip_right; } |
235 | inline FbTk::FbWindow &gripRight() { return m_grip_right; } | 235 | inline FbTk::FbWindow &gripRight() { return m_grip_right; } |
236 | inline const FbTk::TextButton *currentLabel() const { return m_current_label; } | 236 | inline const IconButton *currentLabel() const { return m_current_label; } |
237 | inline bool focused() const { return m_focused; } | 237 | inline bool focused() const { return m_focused; } |
238 | inline bool isShaded() const { return m_shaded; } | 238 | inline bool isShaded() const { return m_shaded; } |
239 | inline FbWinFrameTheme &theme() const { return m_theme; } | 239 | inline FbWinFrameTheme &theme() const { return m_theme; } |
@@ -279,8 +279,8 @@ private: | |||
279 | void applyTitlebar(); | 279 | void applyTitlebar(); |
280 | void applyHandles(); | 280 | void applyHandles(); |
281 | void applyTabContainer(); // and label buttons | 281 | void applyTabContainer(); // and label buttons |
282 | void applyFocusLabel(FbTk::TextButton &button); | 282 | void applyFocusLabel(IconButton &button); |
283 | void applyUnfocusLabel(FbTk::TextButton &button); | 283 | void applyUnfocusLabel(IconButton &button); |
284 | void applyButtons(); // only called within applyTitlebar | 284 | void applyButtons(); // only called within applyTitlebar |
285 | 285 | ||
286 | void getCurrentFocusPixmap(Pixmap &label_pm, Pixmap &title_pm, | 286 | void getCurrentFocusPixmap(Pixmap &label_pm, Pixmap &title_pm, |
@@ -319,7 +319,7 @@ private: | |||
319 | ButtonList m_buttons_left, ///< buttons to the left | 319 | ButtonList m_buttons_left, ///< buttons to the left |
320 | m_buttons_right; ///< buttons to the right | 320 | m_buttons_right; ///< buttons to the right |
321 | typedef std::list<FbTk::TextButton *> LabelList; | 321 | typedef std::list<FbTk::TextButton *> LabelList; |
322 | FbTk::TextButton *m_current_label; ///< which client button is focused at the moment | 322 | IconButton *m_current_label; ///< which client button is focused at the moment |
323 | int m_bevel; ///< bevel between titlebar items and titlebar | 323 | int m_bevel; ///< bevel between titlebar items and titlebar |
324 | bool m_use_titlebar; ///< if we should use titlebar | 324 | bool m_use_titlebar; ///< if we should use titlebar |
325 | bool m_use_tabs; ///< if we should use tabs (turns them off in external mode only) | 325 | bool m_use_tabs; ///< if we should use tabs (turns them off in external mode only) |
@@ -348,11 +348,6 @@ private: | |||
348 | Pixmap m_tabcontainer_unfocused_pm; ///< pixmap for unfocused tab container | 348 | Pixmap m_tabcontainer_unfocused_pm; ///< pixmap for unfocused tab container |
349 | FbTk::Color m_tabcontainer_unfocused_color; ///< color for unfocused tab container | 349 | FbTk::Color m_tabcontainer_unfocused_color; ///< color for unfocused tab container |
350 | 350 | ||
351 | Pixmap m_labelbutton_focused_pm; ///< pixmap for focused label | ||
352 | FbTk::Color m_labelbutton_focused_color; ///< color for focused label | ||
353 | Pixmap m_labelbutton_unfocused_pm; ///< pixmap for unfocused label | ||
354 | FbTk::Color m_labelbutton_unfocused_color; ///< color for unfocused label | ||
355 | |||
356 | FbTk::Color m_handle_focused_color, m_handle_unfocused_color; | 351 | FbTk::Color m_handle_focused_color, m_handle_unfocused_color; |
357 | Pixmap m_handle_focused_pm, m_handle_unfocused_pm; | 352 | Pixmap m_handle_focused_pm, m_handle_unfocused_pm; |
358 | 353 | ||