aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Screen.cc4
-rw-r--r--src/Screen.hh4
-rw-r--r--src/Window.cc23
3 files changed, 6 insertions, 25 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index c538d5e..34cb829 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -294,7 +294,6 @@ BScreen::ScreenResource::ScreenResource(FbTk::ResourceManager &rm,
294 show_window_pos(rm, true, scrname+".showwindowposition", altscrname+".ShowWindowPosition"), 294 show_window_pos(rm, true, scrname+".showwindowposition", altscrname+".ShowWindowPosition"),
295 auto_raise(rm, true, scrname+".autoRaise", altscrname+".AutoRaise"), 295 auto_raise(rm, true, scrname+".autoRaise", altscrname+".AutoRaise"),
296 click_raises(rm, true, scrname+".clickRaises", altscrname+".ClickRaises"), 296 click_raises(rm, true, scrname+".clickRaises", altscrname+".ClickRaises"),
297 decorate_transient(rm, true, scrname+".decorateTransient", altscrname+".DecorateTransient"),
298 default_deco(rm, "NORMAL", scrname+".defaultDeco", altscrname+".DefaultDeco"), 297 default_deco(rm, "NORMAL", scrname+".defaultDeco", altscrname+".DefaultDeco"),
299 rootcommand(rm, "", scrname+".rootCommand", altscrname+".RootCommand"), 298 rootcommand(rm, "", scrname+".rootCommand", altscrname+".RootCommand"),
300 tab_placement(rm, FbWinFrame::TOPLEFT, scrname+".tab.placement", altscrname+".Tab.Placement"), 299 tab_placement(rm, FbWinFrame::TOPLEFT, scrname+".tab.placement", altscrname+".Tab.Placement"),
@@ -1810,9 +1809,6 @@ void BScreen::setupConfigmenu(FbTk::Menu &menu) {
1810 "Workspace Warping", 1809 "Workspace Warping",
1811 "Workspace Warping - dragging windows to the edge and onto the next workspace", 1810 "Workspace Warping - dragging windows to the edge and onto the next workspace",
1812 resource.workspace_warping, saverc_cmd); 1811 resource.workspace_warping, saverc_cmd);
1813 _BOOLITEM(menu, Configmenu, DecorateTransient,
1814 "Decorate Transient Windows", "Decorate Transient Windows",
1815 resource.decorate_transient, saverc_cmd);
1816 _BOOLITEM(menu, Configmenu, ClickRaises, 1812 _BOOLITEM(menu, Configmenu, ClickRaises,
1817 "Click Raises", "Click Raises", 1813 "Click Raises", "Click Raises",
1818 resource.click_raises, saverc_cmd); 1814 resource.click_raises, saverc_cmd);
diff --git a/src/Screen.hh b/src/Screen.hh
index 2cd9ca9..9800d19 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -118,7 +118,6 @@ public:
118 bool getMaxDisableMove() const { return *resource.max_disable_move; } 118 bool getMaxDisableMove() const { return *resource.max_disable_move; }
119 bool getMaxDisableResize() const { return *resource.max_disable_resize; } 119 bool getMaxDisableResize() const { return *resource.max_disable_resize; }
120 bool doShowWindowPos() const { return *resource.show_window_pos; } 120 bool doShowWindowPos() const { return *resource.show_window_pos; }
121 bool decorateTransient() const { return *resource.decorate_transient; }
122 const std::string &defaultDeco() const { return *resource.default_deco; } 121 const std::string &defaultDeco() const { return *resource.default_deco; }
123 const std::string windowMenuFilename() const; 122 const std::string windowMenuFilename() const;
124 FbTk::ImageControl &imageControl() { return *m_image_control.get(); } 123 FbTk::ImageControl &imageControl() { return *m_image_control.get(); }
@@ -552,8 +551,7 @@ private:
552 551
553 FbTk::Resource<bool> opaque_move, full_max, 552 FbTk::Resource<bool> opaque_move, full_max,
554 max_ignore_inc, max_disable_move, max_disable_resize, 553 max_ignore_inc, max_disable_move, max_disable_resize,
555 workspace_warping, show_window_pos, auto_raise, click_raises, 554 workspace_warping, show_window_pos, auto_raise, click_raises;
556 decorate_transient;
557 FbTk::Resource<std::string> default_deco; 555 FbTk::Resource<std::string> default_deco;
558 FbTk::Resource<std::string> rootcommand; 556 FbTk::Resource<std::string> rootcommand;
559 FbTk::Resource<FbWinFrame::TabPlacement> tab_placement; 557 FbTk::Resource<FbWinFrame::TabPlacement> tab_placement;
diff --git a/src/Window.cc b/src/Window.cc
index 98c10f4..8f97954 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -441,15 +441,8 @@ void FluxboxWindow::init() {
441 /* Read state above here, apply state below here. */ 441 /* Read state above here, apply state below here. */
442 /**************************************************/ 442 /**************************************************/
443 443
444 if (m_client->isTransient()) { 444 if (m_client->isTransient() && m_client->transientFor()->fbwindow())
445 if (m_client->transientFor()->fbwindow()) 445 stuck = m_client->transientFor()->fbwindow()->isStuck();
446 stuck = m_client->transientFor()->fbwindow()->isStuck();
447
448 if (!screen().decorateTransient()) {
449 decorations.maximize = functions.maximize = false;
450 decorations.handle = false;
451 }
452 }
453 446
454 if (!m_client->sizeHints().isResizable()) { 447 if (!m_client->sizeHints().isResizable()) {
455 functions.resize = functions.maximize = false; 448 functions.resize = functions.maximize = false;
@@ -2188,18 +2181,12 @@ void FluxboxWindow::propertyNotifyEvent(WinClient &client, Atom atom) {
2188 if (functions.resize || 2181 if (functions.resize ||
2189 functions.maximize) 2182 functions.maximize)
2190 changed = true; 2183 changed = true;
2191 functions.resize=false; 2184 functions.resize = functions.maximize = false;
2192 functions.maximize=false;
2193 } else { 2185 } else {
2194 // TODO: is broken while handled by FbW, needs to be in WinClient 2186 // TODO: is broken while handled by FbW, needs to be in WinClient
2195 if (!client.isTransient() || screen().decorateTransient()) { 2187 if (!functions.maximize || !functions.resize)
2196 if (!functions.maximize)
2197 changed = true;
2198 functions.maximize = true;
2199 }
2200 if (!functions.resize)
2201 changed = true; 2188 changed = true;
2202 functions.resize = true; 2189 functions.maximize = functions.resize = true;
2203 } 2190 }
2204 2191
2205 if (changed) { 2192 if (changed) {