summaryrefslogtreecommitdiff
path: root/src/FbWinFrame.hh
diff options
context:
space:
mode:
Diffstat (limited to 'src/FbWinFrame.hh')
-rw-r--r--src/FbWinFrame.hh19
1 files changed, 4 insertions, 15 deletions
diff --git a/src/FbWinFrame.hh b/src/FbWinFrame.hh
index 4a33fec..7891c36 100644
--- a/src/FbWinFrame.hh
+++ b/src/FbWinFrame.hh
@@ -72,10 +72,7 @@ public:
72 72
73 /// create a top level window 73 /// create a top level window
74 FbWinFrame(BScreen &screen, FocusableTheme<FbWinFrameTheme> &theme, 74 FbWinFrame(BScreen &screen, FocusableTheme<FbWinFrameTheme> &theme,
75 FbTk::ImageControl &imgctrl, 75 FbTk::XLayer &layer, WindowState &state);
76 FbTk::XLayer &layer,
77 int x, int y,
78 unsigned int width, unsigned int height);
79 76
80/* /// create a frame window inside another FbWindow, NOT IMPLEMENTED! 77/* /// create a frame window inside another FbWindow, NOT IMPLEMENTED!
81 FbWinFrame(BScreen &screen, FbWinFrameTheme &theme, FbTk::ImageControl &imgctrl, 78 FbWinFrame(BScreen &screen, FbWinFrameTheme &theme, FbTk::ImageControl &imgctrl,
@@ -89,8 +86,7 @@ public:
89 void hide(); 86 void hide();
90 void show(); 87 void show();
91 bool isVisible() const { return m_visible; } 88 bool isVisible() const { return m_visible; }
92 /// shade frame (ie resize to titlebar size) 89
93 void shade();
94 void move(int x, int y); 90 void move(int x, int y);
95 void resize(unsigned int width, unsigned int height); 91 void resize(unsigned int width, unsigned int height);
96 /// resize client to specified size and resize frame to it 92 /// resize client to specified size and resize frame to it
@@ -117,8 +113,6 @@ public:
117 113
118 /// set focus/unfocus style 114 /// set focus/unfocus style
119 void setFocus(bool newvalue); 115 void setFocus(bool newvalue);
120 void setFullscreen(bool value);
121 void setMaximized(int value);
122 116
123 void setFocusTitle(const std::string &str) { m_label.setText(str); } 117 void setFocusTitle(const std::string &str) { m_label.setText(str); }
124 bool setTabMode(TabMode tabmode); 118 bool setTabMode(TabMode tabmode);
@@ -201,11 +195,6 @@ public:
201 unsigned int width() const { return m_window.width(); } 195 unsigned int width() const { return m_window.width(); }
202 unsigned int height() const { return m_window.height(); } 196 unsigned int height() const { return m_window.height(); }
203 197
204 int normalX() const { return m_state.x; }
205 int normalY() const { return m_state.y; }
206 unsigned int normalWidth() const { return m_state.width; }
207 unsigned int normalHeight() const { return m_state.height; }
208
209 // extra bits for tabs 198 // extra bits for tabs
210 int xOffset() const; 199 int xOffset() const;
211 int yOffset() const; 200 int yOffset() const;
@@ -234,7 +223,6 @@ public:
234 const FbTk::FbWindow &gripRight() const { return m_grip_right; } 223 const FbTk::FbWindow &gripRight() const { return m_grip_right; }
235 FbTk::FbWindow &gripRight() { return m_grip_right; } 224 FbTk::FbWindow &gripRight() { return m_grip_right; }
236 bool focused() const { return m_state.focused; } 225 bool focused() const { return m_state.focused; }
237 bool isShaded() const { return m_state.shaded; }
238 FocusableTheme<FbWinFrameTheme> &theme() const { return m_theme; } 226 FocusableTheme<FbWinFrameTheme> &theme() const { return m_theme; }
239 /// @return titlebar height 227 /// @return titlebar height
240 unsigned int titlebarHeight() const { return (m_use_titlebar?m_titlebar.height()+m_titlebar.borderWidth():0); } 228 unsigned int titlebarHeight() const { return (m_use_titlebar?m_titlebar.height()+m_titlebar.borderWidth():0); }
@@ -311,6 +299,8 @@ private:
311 299
312 FocusableTheme<FbWinFrameTheme> &m_theme; ///< theme to be used 300 FocusableTheme<FbWinFrameTheme> &m_theme; ///< theme to be used
313 FbTk::ImageControl &m_imagectrl; ///< Image control for rendering 301 FbTk::ImageControl &m_imagectrl; ///< Image control for rendering
302 WindowState &m_state;
303
314 /** 304 /**
315 @name windows 305 @name windows
316 */ 306 */
@@ -380,7 +370,6 @@ private:
380 TabMode m_tabmode; 370 TabMode m_tabmode;
381 371
382 unsigned int m_active_orig_client_bw; 372 unsigned int m_active_orig_client_bw;
383 WindowState m_state;
384 373
385 bool m_need_render; 374 bool m_need_render;
386 int m_button_size; ///< size for all titlebar buttons 375 int m_button_size; ///< size for all titlebar buttons