summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/FbWinFrame.cc21
1 files changed, 17 insertions, 4 deletions
diff --git a/src/FbWinFrame.cc b/src/FbWinFrame.cc
index 0bb8b64..869d34e 100644
--- a/src/FbWinFrame.cc
+++ b/src/FbWinFrame.cc
@@ -85,9 +85,16 @@ FbWinFrame::FbWinFrame(BScreen &screen, FbWinFrameTheme &theme, FbTk::ImageContr
85 m_visible(false), 85 m_visible(false),
86 m_button_pm(0), 86 m_button_pm(0),
87 m_tabmode(screen.getDefaultInternalTabs()?INTERNAL:EXTERNAL), 87 m_tabmode(screen.getDefaultInternalTabs()?INTERNAL:EXTERNAL),
88 m_active_gravity(0),
89 m_active_orig_client_bw(0),
88 m_need_render(true), 90 m_need_render(true),
91 m_button_size(1),
92 m_width_before_shade(1),
93 m_height_before_shade(1),
94 m_double_click_time(0),
89 m_themelistener(*this), 95 m_themelistener(*this),
90 m_shape(new Shape(m_window, theme.shapePlace())) { 96 m_shape(new Shape(m_window, theme.shapePlace())),
97 m_disable_shape(false) {
91 m_theme.reconfigSig().attach(&m_themelistener); 98 m_theme.reconfigSig().attach(&m_themelistener);
92 init(); 99 init();
93} 100}
@@ -244,7 +251,11 @@ void FbWinFrame::resize(unsigned int width, unsigned int height) {
244} 251}
245 252
246// need an atomic moveresize where possible 253// need an atomic moveresize where possible
247void FbWinFrame::moveResizeForClient(int x, int y, unsigned int width, unsigned int height, int win_gravity, unsigned int client_bw, bool move, bool resize) { 254void FbWinFrame::moveResizeForClient(int x, int y,
255 unsigned int width, unsigned int height,
256 int win_gravity,
257 unsigned int client_bw,
258 bool move, bool resize) {
248 // total height for frame 259 // total height for frame
249 260
250 if (resize) // these fns check if the elements are "on" 261 if (resize) // these fns check if the elements are "on"
@@ -255,7 +266,8 @@ void FbWinFrame::moveResizeForClient(int x, int y, unsigned int width, unsigned
255 moveResize(x, y, width, height, move, resize); 266 moveResize(x, y, width, height, move, resize);
256} 267}
257 268
258void FbWinFrame::resizeForClient(unsigned int width, unsigned int height, int win_gravity, unsigned int client_bw) { 269void FbWinFrame::resizeForClient(unsigned int width, unsigned int height,
270 int win_gravity, unsigned int client_bw) {
259 moveResizeForClient(0, 0, width, height, win_gravity, client_bw, false, true); 271 moveResizeForClient(0, 0, width, height, win_gravity, client_bw, false, true);
260} 272}
261 273
@@ -1650,7 +1662,8 @@ private:
1650// this function translates its arguments according to win_gravity 1662// this function translates its arguments according to win_gravity
1651// if win_gravity is negative, it does an inverse translation 1663// if win_gravity is negative, it does an inverse translation
1652// This function should be used when a window is mapped/unmapped/pos configured 1664// This function should be used when a window is mapped/unmapped/pos configured
1653void FbWinFrame::gravityTranslate(int &x, int &y, int win_gravity, unsigned int client_bw, bool move_frame) { 1665void FbWinFrame::gravityTranslate(int &x, int &y,
1666 int win_gravity, unsigned int client_bw, bool move_frame) {
1654 bool invert = false; 1667 bool invert = false;
1655 if (win_gravity < 0) { 1668 if (win_gravity < 0) {
1656 invert = true; 1669 invert = true;