nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove option to disable decorations on transient windows

Browse source
This commit is contained in:
Mark Tiefenbruck 2008-08-27 13:59:24 -04:00
parent cbc1075dde
commit 84c87a86f9
3 changed files with 6 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Screen.cc
View file

@ -294,7 +294,6 @@ BScreen::ScreenResource::ScreenResource(FbTk::ResourceManager &rm,
show_window_pos(rm, true, scrname+".showwindowposition", altscrname+".ShowWindowPosition"), show_window_pos(rm, true, scrname+".showwindowposition", altscrname+".ShowWindowPosition"),
auto_raise(rm, true, scrname+".autoRaise", altscrname+".AutoRaise"), auto_raise(rm, true, scrname+".autoRaise", altscrname+".AutoRaise"),
click_raises(rm, true, scrname+".clickRaises", altscrname+".ClickRaises"), click_raises(rm, true, scrname+".clickRaises", altscrname+".ClickRaises"),
decorate_transient(rm, true, scrname+".decorateTransient", altscrname+".DecorateTransient"),
default_deco(rm, "NORMAL", scrname+".defaultDeco", altscrname+".DefaultDeco"), default_deco(rm, "NORMAL", scrname+".defaultDeco", altscrname+".DefaultDeco"),
rootcommand(rm, "", scrname+".rootCommand", altscrname+".RootCommand"), rootcommand(rm, "", scrname+".rootCommand", altscrname+".RootCommand"),
tab_placement(rm, FbWinFrame::TOPLEFT, scrname+".tab.placement", altscrname+".Tab.Placement"), tab_placement(rm, FbWinFrame::TOPLEFT, scrname+".tab.placement", altscrname+".Tab.Placement"),
@ -1810,9 +1809,6 @@ void BScreen::setupConfigmenu(FbTk::Menu &menu) {
"Workspace Warping", "Workspace Warping",
"Workspace Warping - dragging windows to the edge and onto the next workspace", "Workspace Warping - dragging windows to the edge and onto the next workspace",
resource.workspace_warping, saverc_cmd); resource.workspace_warping, saverc_cmd);
_BOOLITEM(menu, Configmenu, DecorateTransient,
"Decorate Transient Windows", "Decorate Transient Windows",
resource.decorate_transient, saverc_cmd);
_BOOLITEM(menu, Configmenu, ClickRaises, _BOOLITEM(menu, Configmenu, ClickRaises,
"Click Raises", "Click Raises", "Click Raises", "Click Raises",
resource.click_raises, saverc_cmd); resource.click_raises, saverc_cmd);

4
src/Screen.hh
View file

@ -118,7 +118,6 @@ public:
bool getMaxDisableMove() const { return *resource.max_disable_move; } bool getMaxDisableMove() const { return *resource.max_disable_move; }
bool getMaxDisableResize() const { return *resource.max_disable_resize; } bool getMaxDisableResize() const { return *resource.max_disable_resize; }
bool doShowWindowPos() const { return *resource.show_window_pos; } bool doShowWindowPos() const { return *resource.show_window_pos; }
bool decorateTransient() const { return *resource.decorate_transient; }
const std::string &defaultDeco() const { return *resource.default_deco; } const std::string &defaultDeco() const { return *resource.default_deco; }
const std::string windowMenuFilename() const; const std::string windowMenuFilename() const;
FbTk::ImageControl &imageControl() { return *m_image_control.get(); } FbTk::ImageControl &imageControl() { return *m_image_control.get(); }
@ -552,8 +551,7 @@ private:
FbTk::Resource<bool> opaque_move, full_max, FbTk::Resource<bool> opaque_move, full_max,
max_ignore_inc, max_disable_move, max_disable_resize, max_ignore_inc, max_disable_move, max_disable_resize,
workspace_warping, show_window_pos, auto_raise, click_raises, workspace_warping, show_window_pos, auto_raise, click_raises;
decorate_transient;
FbTk::Resource<std::string> default_deco; FbTk::Resource<std::string> default_deco;
FbTk::Resource<std::string> rootcommand; FbTk::Resource<std::string> rootcommand;
FbTk::Resource<FbWinFrame::TabPlacement> tab_placement; FbTk::Resource<FbWinFrame::TabPlacement> tab_placement;

23
src/Window.cc
View file

@ -441,15 +441,8 @@ void FluxboxWindow::init() {
/* Read state above here, apply state below here. */ /* Read state above here, apply state below here. */
/**************************************************/ /**************************************************/
if (m_client->isTransient()) { if (m_client->isTransient() && m_client->transientFor()->fbwindow())
if (m_client->transientFor()->fbwindow()) stuck = m_client->transientFor()->fbwindow()->isStuck();
stuck = m_client->transientFor()->fbwindow()->isStuck();
if (!screen().decorateTransient()) {
decorations.maximize = functions.maximize = false;
decorations.handle = false;
}
}
if (!m_client->sizeHints().isResizable()) { if (!m_client->sizeHints().isResizable()) {
functions.resize = functions.maximize = false; functions.resize = functions.maximize = false;
@ -2188,18 +2181,12 @@ void FluxboxWindow::propertyNotifyEvent(WinClient &client, Atom atom) {
if (functions.resize || if (functions.resize ||
functions.maximize) functions.maximize)
changed = true; changed = true;
functions.resize=false; functions.resize = functions.maximize = false;
functions.maximize=false;
} else { } else {
// TODO: is broken while handled by FbW, needs to be in WinClient // TODO: is broken while handled by FbW, needs to be in WinClient
if (!client.isTransient() || screen().decorateTransient()) { if (!functions.maximize || !functions.resize)
if (!functions.maximize)
changed = true;
functions.maximize = true;
}
if (!functions.resize)
changed = true; changed = true;
functions.resize = true; functions.maximize = functions.resize = true;
} }
if (changed) { if (changed) {