summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Screen.cc7
-rw-r--r--src/Screen.hh5
-rw-r--r--src/Window.cc4
3 files changed, 11 insertions, 5 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index 750902f..5941c1d 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Screen.cc,v 1.272 2004/03/23 09:21:29 fluxgen Exp $ 25// $Id: Screen.cc,v 1.273 2004/03/30 13:46:34 fluxgen Exp $
26 26
27 27
28#include "Screen.hh" 28#include "Screen.hh"
@@ -474,6 +474,7 @@ BScreen::ScreenResource::ScreenResource(FbTk::ResourceManager &rm,
474 antialias(rm, false, scrname+".antialias", altscrname+".Antialias"), 474 antialias(rm, false, scrname+".antialias", altscrname+".Antialias"),
475 auto_raise(rm, false, scrname+".autoRaise", altscrname+".AutoRaise"), 475 auto_raise(rm, false, scrname+".autoRaise", altscrname+".AutoRaise"),
476 click_raises(rm, true, scrname+".clickRaises", altscrname+".ClickRaises"), 476 click_raises(rm, true, scrname+".clickRaises", altscrname+".ClickRaises"),
477 decorate_transient(rm, false, scrname+".decorateTransient", altscrname+".DecorateTransient"),
477 rootcommand(rm, "", scrname+".rootCommand", altscrname+".RootCommand"), 478 rootcommand(rm, "", scrname+".rootCommand", altscrname+".RootCommand"),
478 resizemode(rm, "", scrname+".resizeMode", altscrname+".ResizeMode"), 479 resizemode(rm, "", scrname+".resizeMode", altscrname+".ResizeMode"),
479 focus_model(rm, CLICKTOFOCUS, scrname+".focusModel", altscrname+".FocusModel"), 480 focus_model(rm, CLICKTOFOCUS, scrname+".focusModel", altscrname+".FocusModel"),
@@ -2321,6 +2322,10 @@ void BScreen::setupConfigmenu(FbTk::Menu &menu) {
2321 "Desktop MouseWheel Switching"), 2322 "Desktop MouseWheel Switching"),
2322 *resource.desktop_wheeling, saverc_cmd)); 2323 *resource.desktop_wheeling, saverc_cmd));
2323 2324
2325 menu.insert(new
2326 BoolMenuItem(i18n->getMessage(ConfigmenuSet, ConfigmenuDecorateTransient,
2327 "Decorate Transient Windows"),
2328 *resource.decorate_transient, saverc_cmd));
2324 menu.insert(new BoolMenuItem("Click Raises", 2329 menu.insert(new BoolMenuItem("Click Raises",
2325 *resource.click_raises, 2330 *resource.click_raises,
2326 saverc_cmd)); 2331 saverc_cmd));
diff --git a/src/Screen.hh b/src/Screen.hh
index 707f831..b84b950 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Screen.hh,v 1.136 2004/03/22 21:01:10 fluxgen Exp $ 25// $Id: Screen.hh,v 1.137 2004/03/30 13:45:20 fluxgen Exp $
26 26
27#ifndef SCREEN_HH 27#ifndef SCREEN_HH
28#define SCREEN_HH 28#define SCREEN_HH
@@ -103,6 +103,7 @@ public:
103 inline bool doFocusLast() const { return *resource.focus_last; } 103 inline bool doFocusLast() const { return *resource.focus_last; }
104 inline bool doShowWindowPos() const { return *resource.show_window_pos; } 104 inline bool doShowWindowPos() const { return *resource.show_window_pos; }
105 inline bool antialias() const { return *resource.antialias; } 105 inline bool antialias() const { return *resource.antialias; }
106 inline bool decorateTransient() const { return *resource.decorate_transient; }
106 107
107 inline FbTk::ImageControl &imageControl() { return *m_image_control.get(); } 108 inline FbTk::ImageControl &imageControl() { return *m_image_control.get(); }
108 const FbTk::Menu &getRootmenu() const { return *m_rootmenu.get(); } 109 const FbTk::Menu &getRootmenu() const { return *m_rootmenu.get(); }
@@ -421,7 +422,7 @@ private:
421 sloppy_window_grouping, workspace_warping, 422 sloppy_window_grouping, workspace_warping,
422 desktop_wheeling, show_window_pos, 423 desktop_wheeling, show_window_pos,
423 focus_last, focus_new, 424 focus_last, focus_new,
424 antialias, auto_raise, click_raises; 425 antialias, auto_raise, click_raises, decorate_transient;
425 FbTk::Resource<std::string> rootcommand; 426 FbTk::Resource<std::string> rootcommand;
426 FbTk::Resource<std::string> resizemode; 427 FbTk::Resource<std::string> resizemode;
427 FbTk::Resource<FocusModel> focus_model; 428 FbTk::Resource<FocusModel> focus_model;
diff --git a/src/Window.cc b/src/Window.cc
index ac719c0..106f8fe 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Window.cc,v 1.272 2004/03/28 17:48:20 fluxgen Exp $ 25// $Id: Window.cc,v 1.273 2004/03/30 13:48:38 fluxgen Exp $
26 26
27#include "Window.hh" 27#include "Window.hh"
28 28
@@ -464,7 +464,7 @@ void FluxboxWindow::init() {
464 m_client->updateTransientInfo(); 464 m_client->updateTransientInfo();
465 465
466 // adjust the window decorations based on transience and window sizes 466 // adjust the window decorations based on transience and window sizes
467 if (m_client->isTransient()) { 467 if (m_client->isTransient() && !screen().decorateTransient()) {
468 decorations.maximize = functions.maximize = false; 468 decorations.maximize = functions.maximize = false;
469 decorations.handle = false; 469 decorations.handle = false;
470 } 470 }