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

fix some default values

Browse source
This commit is contained in:
Mark Tiefenbruck 2008-09-11 15:48:46 -07:00
parent 3ac1ab023e
commit de8275f688
3 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/Screen.cc
View file

@ -300,9 +300,9 @@ BScreen::ScreenResource::ScreenResource(FbTk::ResourceManager &rm,
tab_placement(rm, FbWinFrame::TOPLEFT, scrname+".tab.placement", altscrname+".Tab.Placement"),
windowmenufile(rm, Fluxbox::instance()->getDefaultDataFilename("windowmenu"), scrname+".windowMenu", altscrname+".WindowMenu"),
typing_delay(rm, 0, scrname+".noFocusWhileTypingDelay", altscrname+".NoFocusWhileTypingDelay"),
follow_model(rm, IGNORE_OTHER_WORKSPACES, scrname+".followModel", altscrname+".followModel"),
user_follow_model(rm, FOLLOW_ACTIVE_WINDOW, scrname+".userFollowModel", altscrname+".UserFollowModel"),
workspaces(rm, 1, scrname+".workspaces", altscrname+".Workspaces"),
follow_model(rm, SEMIFOLLOW_ACTIVE_WINDOW, scrname+".followModel", altscrname+".followModel"),
user_follow_model(rm, SEMIFOLLOW_ACTIVE_WINDOW, scrname+".userFollowModel", altscrname+".UserFollowModel"),
workspaces(rm, 4, scrname+".workspaces", altscrname+".Workspaces"),
edge_snap_threshold(rm, 10, scrname+".edgeSnapThreshold", altscrname+".EdgeSnapThreshold"),
focused_alpha(rm, 255, scrname+".window.focus.alpha", altscrname+".Window.Focus.Alpha"),
unfocused_alpha(rm, 255, scrname+".window.unfocus.alpha", altscrname+".Window.Unfocus.Alpha"),
@ -326,8 +326,6 @@ BScreen::ScreenResource::ScreenResource(FbTk::ResourceManager &rm,
FbTk::GContext::CAPNOTLAST,
scrname+".overlay.capStyle",
altscrname+".overlay.CapStyle"),
scroll_action(rm, "", scrname+".windowScrollAction", altscrname+".WindowScrollAction"),
scroll_reverse(rm, false, scrname+".windowScrollReverse", altscrname+".WindowScrollReverse"),
allow_remote_actions(rm, false, scrname+".allowRemoteActions", altscrname+".AllowRemoteActions"),
clientmenu_use_pixmap(rm, true, scrname+".clientMenu.usePixmap", altscrname+".ClientMenu.UsePixmap"),
tabs_use_pixmap(rm, true, scrname+".tabs.usePixmap", altscrname+".Tabs.UsePixmap"),
@ -506,6 +504,11 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
renderPosWindow();
m_tooltip_window->setDelay(*resource.tooltip_delay);
//!! TODO: we shouldn't do this more than once, but since slit handles their
// own resources we must do this.
fluxbox->load_rc(*this);
// setup workspaces and workspace menu
int nr_ws = *resource.workspaces;
addWorkspace(); // at least one
@ -515,11 +518,6 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
m_current_workspace = m_workspaces_list.front();
//!! TODO: we shouldn't do this more than once, but since slit handles their
// own resources we must do this.
fluxbox->load_rc(*this);
m_windowmenu.reset(createMenu(""));
m_windowmenu->setInternalMenu();
m_windowmenu->setReloadHelper(new FbTk::AutoReloadHelper());

5
src/Screen.hh
View file

@ -136,9 +136,6 @@ public:
unsigned int noFocusWhileTypingDelay() const { return *resource.typing_delay; }
FollowModel getFollowModel() const { return *resource.follow_model; }
FollowModel getUserFollowModel() const { return *resource.user_follow_model; }
const std::string &getScrollAction() const { return *resource.scroll_action; }
const bool getScrollReverse() const { return *resource.scroll_reverse; }
const bool allowRemoteActions() const { return *resource.allow_remote_actions; }
const bool clientMenuUsePixmap() const { return *resource.clientmenu_use_pixmap; }
const bool getDefaultInternalTabs() const { return *resource.default_internal_tabs; }
@ -565,8 +562,6 @@ private:
FbTk::Resource<FbTk::GContext::LineStyle> gc_line_style;
FbTk::Resource<FbTk::GContext::JoinStyle> gc_join_style;
FbTk::Resource<FbTk::GContext::CapStyle> gc_cap_style;
FbTk::Resource<std::string> scroll_action;
FbTk::Resource<bool> scroll_reverse;
FbTk::Resource<bool> allow_remote_actions;
FbTk::Resource<bool> clientmenu_use_pixmap;
FbTk::Resource<bool> tabs_use_pixmap;

2
src/ScreenPlacement.cc
View file

@ -47,7 +47,7 @@ ScreenPlacement::ScreenPlacement(BScreen &screen):
m_col_direction(screen.resourceManager(), TOPBOTTOM,
screen.name()+".colPlacementDirection",
screen.altName()+".ColPlacementDirection"),
m_placement_policy(screen.resourceManager(), ROWSMARTPLACEMENT,
m_placement_policy(screen.resourceManager(), ROWMINOVERLAPPLACEMENT,
screen.name()+".windowPlacement",
screen.altName()+".WindowPlacement"),
m_old_policy(ROWSMARTPLACEMENT),