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

added resource and menu item for maximizing over tabs

Browse source
This commit is contained in:
markt 2006-07-26 01:22:42 +00:00
parent 9229f8bc9c
commit 14efe686cd
4 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
(Format: Year/Month/Day)
Changes for 1.0rc3:
*06/07/26:
* Added resource and menu item for maximizing over external tabs (Mark)
Screen.cc/hh Window.cc
*06/07/25:
* Fix so that focus doesn't revert away from command dialogs (Mark)
fluxbox.cc/hh CommandDialog.cc

4
src/Screen.cc
View file

@ -287,6 +287,7 @@ BScreen::ScreenResource::ScreenResource(FbTk::ResourceManager &rm,
altscrname+".overlay.CapStyle"),
scroll_action(rm, "", scrname+".windowScrollAction", altscrname+".WindowScrollAction"),
scroll_reverse(rm, false, scrname+".windowScrollReverse", altscrname+".WindowScrollReverse"),
max_over_tabs(rm, false, scrname+".tabs.maxOver", altscrname+".Tabs.MaxOver"),
default_internal_tabs(rm, false /* TODO: autoconf option? */ , scrname+".tabs.intitlebar", altscrname+".Tabs.InTitlebar") {
@ -1656,6 +1657,9 @@ void BScreen::setupConfigmenu(FbTk::Menu &menu) {
_BOOLITEM(*tab_menu,Configmenu, TabsInTitlebar,
"Tabs in Titlebar", "Tabs in Titlebar",
*resource.default_internal_tabs, save_and_reconftabs);
tab_menu->insert(new BoolMenuItem(_FB_XTEXT(Common, MaximizeOver,
"Maximize Over", "Maximize over this thing when maximizing"),
*resource.max_over_tabs, save_and_reconfigure));
FbTk::MenuItem *tab_width_item =
new IntResMenuItem(_FB_XTEXT(Configmenu, ExternalTabWidth,

2
src/Screen.hh
View file

@ -140,6 +140,7 @@ public:
inline const std::string &getScrollAction() const { return *resource.scroll_action; }
inline const bool getScrollReverse() const { return *resource.scroll_reverse; }
inline const bool getDefaultInternalTabs() const { return *resource.default_internal_tabs; }
inline const bool getMaxOverTabs() const { return *resource.max_over_tabs; }
inline unsigned int getTabWidth() const { return *resource.tab_width; }
@ -452,6 +453,7 @@ private:
FbTk::Resource<FbTk::GContext::CapStyle> gc_cap_style;
FbTk::Resource<std::string> scroll_action;
FbTk::Resource<bool> scroll_reverse;
FbTk::Resource<bool> max_over_tabs;
FbTk::Resource<bool> default_internal_tabs;
} resource;

8
src/Window.cc
View file

@ -1728,6 +1728,10 @@ void FluxboxWindow::maximize(int type) {
m_old_height = new_h;
new_y = screen().maxTop(head);
new_h = screen().maxBottom(head) - new_y - 2*frame().window().borderWidth();
if (!screen().getMaxOverTabs()) {
new_y += yOffset();
new_h -= heightOffset();
}
}
maximized ^= MAX_VERT;
}
@ -1747,6 +1751,10 @@ void FluxboxWindow::maximize(int type) {
m_old_width = new_w;
new_x = screen().maxLeft(head);
new_w = screen().maxRight(head) - new_x - 2*frame().window().borderWidth();
if (!screen().getMaxOverTabs()) {
new_x += xOffset();
new_w -= widthOffset();
}
}
maximized ^= MAX_HORZ;
}