diff options
author | Mathias Gumz <akira at fluxbox dot org> | 2007-12-29 21:38:53 (GMT) |
---|---|---|
committer | Mathias Gumz <akira at fluxbox dot org> | 2007-12-29 21:38:53 (GMT) |
commit | e1f362ae764884a4cd1e1673292cb37d5a85f89c (patch) | |
tree | 137430b26aee6f3638f27281d3757c2c75ef4b20 /src/FbWinFrame.hh | |
parent | e90c3678d9e54bc9251619fdee2d7341f042167b (diff) | |
download | fluxbox-e1f362ae764884a4cd1e1673292cb37d5a85f89c.zip fluxbox-e1f362ae764884a4cd1e1673292cb37d5a85f89c.tar.bz2 |
'inline' in class declaration is implicitly inline
Diffstat (limited to 'src/FbWinFrame.hh')
-rw-r--r-- | src/FbWinFrame.hh | 88 |
1 files changed, 44 insertions, 44 deletions
diff --git a/src/FbWinFrame.hh b/src/FbWinFrame.hh index 052c29d..6db69a8 100644 --- a/src/FbWinFrame.hh +++ b/src/FbWinFrame.hh | |||
@@ -63,13 +63,13 @@ public: | |||
63 | enum TabMode { NOTSET = 0, INTERNAL = 1, EXTERNAL }; | 63 | enum TabMode { NOTSET = 0, INTERNAL = 1, EXTERNAL }; |
64 | 64 | ||
65 | /// Toolbar placement on the screen | 65 | /// Toolbar placement on the screen |
66 | enum TabPlacement{ | 66 | enum TabPlacement{ |
67 | // top and bottom placement | 67 | // top and bottom placement |
68 | TOPLEFT = 1, BOTTOMLEFT, | 68 | TOPLEFT = 1, BOTTOMLEFT, |
69 | TOPRIGHT, BOTTOMRIGHT, | 69 | TOPRIGHT, BOTTOMRIGHT, |
70 | // left and right placement | 70 | // left and right placement |
71 | LEFTBOTTOM, LEFTTOP, | 71 | LEFTBOTTOM, LEFTTOP, |
72 | RIGHTBOTTOM, RIGHTTOP | 72 | RIGHTBOTTOM, RIGHTTOP |
73 | }; | 73 | }; |
74 | 74 | ||
75 | /** | 75 | /** |
@@ -108,9 +108,9 @@ public: | |||
108 | unsigned int width, unsigned int height); | 108 | unsigned int width, unsigned int height); |
109 | 109 | ||
110 | /* /// create a frame window inside another FbWindow, NOT IMPLEMENTED! | 110 | /* /// create a frame window inside another FbWindow, NOT IMPLEMENTED! |
111 | FbWinFrame(BScreen &screen, FbWinFrameTheme &theme, FbTk::ImageControl &imgctrl, | 111 | FbWinFrame(BScreen &screen, FbWinFrameTheme &theme, FbTk::ImageControl &imgctrl, |
112 | const FbTk::FbWindow &parent, | 112 | const FbTk::FbWindow &parent, |
113 | int x, int y, | 113 | int x, int y, |
114 | unsigned int width, unsigned int height); | 114 | unsigned int width, unsigned int height); |
115 | */ | 115 | */ |
116 | /// destroy frame | 116 | /// destroy frame |
@@ -118,7 +118,7 @@ public: | |||
118 | 118 | ||
119 | void hide(); | 119 | void hide(); |
120 | void show(); | 120 | void show(); |
121 | inline bool isVisible() const { return m_visible; } | 121 | bool isVisible() const { return m_visible; } |
122 | /// shade frame (ie resize to titlebar size) | 122 | /// shade frame (ie resize to titlebar size) |
123 | void shade(); | 123 | void shade(); |
124 | void move(int x, int y); | 124 | void move(int x, int y); |
@@ -127,17 +127,17 @@ public: | |||
127 | void resizeForClient(unsigned int width, unsigned int height, int win_gravity=ForgetGravity, unsigned int client_bw = 0); | 127 | void resizeForClient(unsigned int width, unsigned int height, int win_gravity=ForgetGravity, unsigned int client_bw = 0); |
128 | 128 | ||
129 | // for when there needs to be an atomic move+resize operation | 129 | // for when there needs to be an atomic move+resize operation |
130 | void moveResizeForClient(int x, int y, | 130 | void moveResizeForClient(int x, int y, |
131 | unsigned int width, unsigned int height, | 131 | unsigned int width, unsigned int height, |
132 | int win_gravity=ForgetGravity, unsigned int client_bw = 0, bool move = true, bool resize = true); | 132 | int win_gravity=ForgetGravity, unsigned int client_bw = 0, bool move = true, bool resize = true); |
133 | 133 | ||
134 | // can elect to ignore move or resize (mainly for use of move/resize individual functions | 134 | // can elect to ignore move or resize (mainly for use of move/resize individual functions |
135 | void moveResize(int x, int y, | 135 | void moveResize(int x, int y, |
136 | unsigned int width, unsigned int height, | 136 | unsigned int width, unsigned int height, |
137 | bool move = true, bool resize = true); | 137 | bool move = true, bool resize = true); |
138 | 138 | ||
139 | // move without transparency or special effects (generally when dragging) | 139 | // move without transparency or special effects (generally when dragging) |
140 | void quietMoveResize(int x, int y, | 140 | void quietMoveResize(int x, int y, |
141 | unsigned int width, unsigned int height); | 141 | unsigned int width, unsigned int height); |
142 | 142 | ||
143 | /// some outside move/resize happened, and we need to notify all of our windows | 143 | /// some outside move/resize happened, and we need to notify all of our windows |
@@ -147,9 +147,9 @@ public: | |||
147 | 147 | ||
148 | /// set focus/unfocus style | 148 | /// set focus/unfocus style |
149 | void setFocus(bool newvalue); | 149 | void setFocus(bool newvalue); |
150 | inline void setFocusTitle(const std::string &str) { m_label.setText(str); } | 150 | void setFocusTitle(const std::string &str) { m_label.setText(str); } |
151 | bool setTabMode(TabMode tabmode); | 151 | bool setTabMode(TabMode tabmode); |
152 | inline void updateTabProperties() { alignTabs(); } | 152 | void updateTabProperties() { alignTabs(); } |
153 | 153 | ||
154 | /// Alpha settings | 154 | /// Alpha settings |
155 | void setAlpha(bool focused, unsigned char value); | 155 | void setAlpha(bool focused, unsigned char value); |
@@ -215,7 +215,7 @@ public: | |||
215 | void configureNotifyEvent(XConfigureEvent &event); | 215 | void configureNotifyEvent(XConfigureEvent &event); |
216 | void handleEvent(XEvent &event); | 216 | void handleEvent(XEvent &event); |
217 | //@} | 217 | //@} |
218 | 218 | ||
219 | void reconfigure(); | 219 | void reconfigure(); |
220 | void setUseShape(bool value); | 220 | void setUseShape(bool value); |
221 | void setShapingClient(FbTk::FbWindow *win, bool always_update); | 221 | void setShapingClient(FbTk::FbWindow *win, bool always_update); |
@@ -225,10 +225,10 @@ public: | |||
225 | @name accessors | 225 | @name accessors |
226 | */ | 226 | */ |
227 | //@{ | 227 | //@{ |
228 | inline int x() const { return m_window.x(); } | 228 | int x() const { return m_window.x(); } |
229 | inline int y() const { return m_window.y(); } | 229 | int y() const { return m_window.y(); } |
230 | inline unsigned int width() const { return m_window.width(); } | 230 | unsigned int width() const { return m_window.width(); } |
231 | inline unsigned int height() const { return m_window.height(); } | 231 | unsigned int height() const { return m_window.height(); } |
232 | unsigned int normalHeight() const; | 232 | unsigned int normalHeight() const; |
233 | 233 | ||
234 | // extra bits for tabs | 234 | // extra bits for tabs |
@@ -237,31 +237,31 @@ public: | |||
237 | int widthOffset() const; | 237 | int widthOffset() const; |
238 | int heightOffset() const; | 238 | int heightOffset() const; |
239 | 239 | ||
240 | inline const FbTk::FbWindow &window() const { return m_window; } | 240 | const FbTk::FbWindow &window() const { return m_window; } |
241 | inline FbTk::FbWindow &window() { return m_window; } | 241 | FbTk::FbWindow &window() { return m_window; } |
242 | /// @return titlebar window | 242 | /// @return titlebar window |
243 | inline const FbTk::FbWindow &titlebar() const { return m_titlebar; } | 243 | const FbTk::FbWindow &titlebar() const { return m_titlebar; } |
244 | inline FbTk::FbWindow &titlebar() { return m_titlebar; } | 244 | FbTk::FbWindow &titlebar() { return m_titlebar; } |
245 | inline const FbTk::FbWindow &label() const { return m_label; } | 245 | const FbTk::FbWindow &label() const { return m_label; } |
246 | inline FbTk::FbWindow &label() { return m_label; } | 246 | FbTk::FbWindow &label() { return m_label; } |
247 | 247 | ||
248 | inline const FbTk::Container &tabcontainer() const { return m_tab_container; } | 248 | const FbTk::Container &tabcontainer() const { return m_tab_container; } |
249 | inline FbTk::Container &tabcontainer() { return m_tab_container; } | 249 | FbTk::Container &tabcontainer() { return m_tab_container; } |
250 | 250 | ||
251 | /// @return clientarea window | 251 | /// @return clientarea window |
252 | inline const FbTk::FbWindow &clientArea() const { return m_clientarea; } | 252 | const FbTk::FbWindow &clientArea() const { return m_clientarea; } |
253 | inline FbTk::FbWindow &clientArea() { return m_clientarea; } | 253 | FbTk::FbWindow &clientArea() { return m_clientarea; } |
254 | /// @return handle window | 254 | /// @return handle window |
255 | inline const FbTk::FbWindow &handle() const { return m_handle; } | 255 | const FbTk::FbWindow &handle() const { return m_handle; } |
256 | inline FbTk::FbWindow &handle() { return m_handle; } | 256 | FbTk::FbWindow &handle() { return m_handle; } |
257 | inline const FbTk::FbWindow &gripLeft() const { return m_grip_left; } | 257 | const FbTk::FbWindow &gripLeft() const { return m_grip_left; } |
258 | inline FbTk::FbWindow &gripLeft() { return m_grip_left; } | 258 | FbTk::FbWindow &gripLeft() { return m_grip_left; } |
259 | inline const FbTk::FbWindow &gripRight() const { return m_grip_right; } | 259 | const FbTk::FbWindow &gripRight() const { return m_grip_right; } |
260 | inline FbTk::FbWindow &gripRight() { return m_grip_right; } | 260 | FbTk::FbWindow &gripRight() { return m_grip_right; } |
261 | inline const IconButton *currentLabel() const { return m_current_label; } | 261 | const IconButton *currentLabel() const { return m_current_label; } |
262 | inline bool focused() const { return m_focused; } | 262 | bool focused() const { return m_focused; } |
263 | inline bool isShaded() const { return m_shaded; } | 263 | bool isShaded() const { return m_shaded; } |
264 | inline FbWinFrameTheme &theme() const { return m_theme; } | 264 | FbWinFrameTheme &theme() const { return m_theme; } |
265 | /// @return titlebar height | 265 | /// @return titlebar height |
266 | unsigned int titlebarHeight() const { return (m_use_titlebar?m_titlebar.height()+m_window.borderWidth():0); } | 266 | unsigned int titlebarHeight() const { return (m_use_titlebar?m_titlebar.height()+m_window.borderWidth():0); } |
267 | unsigned int handleHeight() const { return (m_use_handle?m_handle.height()+m_window.borderWidth():0); } | 267 | unsigned int handleHeight() const { return (m_use_handle?m_handle.height()+m_window.borderWidth():0); } |
@@ -269,8 +269,8 @@ public: | |||
269 | unsigned int buttonHeight() const; | 269 | unsigned int buttonHeight() const; |
270 | bool externalTabMode() const { return m_tabmode == EXTERNAL && m_use_tabs; } | 270 | bool externalTabMode() const { return m_tabmode == EXTERNAL && m_use_tabs; } |
271 | 271 | ||
272 | inline const FbTk::XLayerItem &layerItem() const { return m_layeritem; } | 272 | const FbTk::XLayerItem &layerItem() const { return m_layeritem; } |
273 | inline FbTk::XLayerItem &layerItem() { return m_layeritem; } | 273 | FbTk::XLayerItem &layerItem() { return m_layeritem; } |
274 | 274 | ||
275 | //@} | 275 | //@} |
276 | 276 | ||
@@ -320,7 +320,7 @@ private: | |||
320 | 320 | ||
321 | BScreen &m_screen; | 321 | BScreen &m_screen; |
322 | 322 | ||
323 | FbWinFrameTheme &m_theme; ///< theme to be used | 323 | FbWinFrameTheme &m_theme; ///< theme to be used |
324 | FbTk::ImageControl &m_imagectrl; ///< Image control for rendering | 324 | FbTk::ImageControl &m_imagectrl; ///< Image control for rendering |
325 | /** | 325 | /** |
326 | @name windows | 326 | @name windows |
@@ -373,9 +373,9 @@ private: | |||
373 | 373 | ||
374 | FbTk::Color m_handle_focused_color, m_handle_unfocused_color; | 374 | FbTk::Color m_handle_focused_color, m_handle_unfocused_color; |
375 | Pixmap m_handle_focused_pm, m_handle_unfocused_pm; | 375 | Pixmap m_handle_focused_pm, m_handle_unfocused_pm; |
376 | |||
377 | 376 | ||
378 | Pixmap m_button_pm; ///< normal button | 377 | |
378 | Pixmap m_button_pm; ///< normal button | ||
379 | FbTk::Color m_button_color; ///< normal color button | 379 | FbTk::Color m_button_color; ///< normal color button |
380 | Pixmap m_button_unfocused_pm; ///< unfocused button | 380 | Pixmap m_button_unfocused_pm; ///< unfocused button |
381 | FbTk::Color m_button_unfocused_color; ///< unfocused color button | 381 | FbTk::Color m_button_unfocused_color; ///< unfocused color button |