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

recovered lost change from 041d586972

Browse source 
got lost in d3eabeb805 somehow
This commit is contained in:
Mathias Gumz 2010-09-18 09:26:05 +02:00
parent 87b45bd0d1
commit 9cf312fc9d
1 changed files with 65 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

159
src/Screen.cc
View file

@ -183,7 +183,7 @@ int calcSquareDistance(int x1, int y1, int x2, int y2) {
class TabPlacementMenuItem: public FbTk::RadioMenuItem { class TabPlacementMenuItem: public FbTk::RadioMenuItem {
public: public:
TabPlacementMenuItem(FbTk::FbString & label, BScreen &screen, TabPlacementMenuItem(const FbTk::FbString & label, BScreen &screen,
FbWinFrame::TabPlacement place, FbWinFrame::TabPlacement place,
FbTk::RefCount<FbTk::Command<void> > &cmd): FbTk::RefCount<FbTk::Command<void> > &cmd):
FbTk::RadioMenuItem(label, cmd), FbTk::RadioMenuItem(label, cmd),
@ -208,6 +208,28 @@ void clampMenuDelay(int& delay) {
delay = FbTk::Util::clamp(delay, 0, 5000); delay = FbTk::Util::clamp(delay, 0, 5000);
} }
struct TabPlacementString {
FbWinFrame::TabPlacement placement;
const char* str;
};
const TabPlacementString placement_strings[] = {
{ FbWinFrame::TOPLEFT, "TopLeft" },
{ FbWinFrame::TOP, "Top" },
{ FbWinFrame::TOPRIGHT, "TopRight" },
{ FbWinFrame::BOTTOMLEFT, "BottomLeft" },
{ FbWinFrame::BOTTOM, "Bottom" },
{ FbWinFrame::BOTTOMRIGHT, "BottomRight" },
{ FbWinFrame::LEFTBOTTOM, "LeftBottom" },
{ FbWinFrame::LEFT, "Left" },
{ FbWinFrame::LEFTTOP, "LeftTop" },
{ FbWinFrame::RIGHTBOTTOM, "RightBottom" },
{ FbWinFrame::RIGHT, "Right" },
{ FbWinFrame::RIGHTTOP, "RightTop" }
};
} // end anonymous namespace } // end anonymous namespace
@ -217,76 +239,24 @@ namespace FbTk {
template<> template<>
string FbTk::Resource<FbWinFrame::TabPlacement>:: string FbTk::Resource<FbWinFrame::TabPlacement>::
getString() const { getString() const {
switch (m_value) {
case FbWinFrame::TOPLEFT: size_t i = (m_value == FbTk::Util::clamp(m_value, FbWinFrame::TOPLEFT, FbWinFrame::RIGHTTOP)
return string("TopLeft"); ? m_value
break; : FbWinFrame::DEFAULT) - 1;
case FbWinFrame::BOTTOMLEFT: return placement_strings[i].str;
return string("BottomLeft");
break;
case FbWinFrame::TOP:
return string("Top");
break;
case FbWinFrame::BOTTOM:
return string("Bottom");
break;
case FbWinFrame::TOPRIGHT:
return string("TopRight");
break;
case FbWinFrame::BOTTOMRIGHT:
return string("BottomRight");
break;
case FbWinFrame::LEFTTOP:
return string("LeftTop");
break;
case FbWinFrame::LEFT:
return string("Left");
break;
case FbWinFrame::LEFTBOTTOM:
return string("LeftBottom");
break;
case FbWinFrame::RIGHTTOP:
return string("RightTop");
break;
case FbWinFrame::RIGHT:
return string("Right");
break;
case FbWinFrame::RIGHTBOTTOM:
return string("RightBottom");
break;
}
//default string
return string("TopLeft");
} }
template<> template<>
void FbTk::Resource<FbWinFrame::TabPlacement>:: void FbTk::Resource<FbWinFrame::TabPlacement>::
setFromString(const char *strval) { setFromString(const char *strval) {
if (strcasecmp(strval, "TopLeft") == 0)
m_value = FbWinFrame::TOPLEFT; size_t i;
else if (strcasecmp(strval, "BottomLeft") == 0) for (i = 0; i < sizeof(placement_strings)/sizeof(TabPlacementString); ++i) {
m_value = FbWinFrame::BOTTOMLEFT; if (strcasecmp(strval, placement_strings[i].str) == 0) {
else if (strcasecmp(strval, "Top") == 0) m_value = placement_strings[i].placement;
m_value = FbWinFrame::TOP; return;
else if (strcasecmp(strval, "Bottom") == 0) }
m_value = FbWinFrame::BOTTOM; }
else if (strcasecmp(strval, "TopRight") == 0)
m_value = FbWinFrame::TOPRIGHT;
else if (strcasecmp(strval, "BottomRight") == 0)
m_value = FbWinFrame::BOTTOMRIGHT;
else if (strcasecmp(strval, "LeftTop") == 0)
m_value = FbWinFrame::LEFTTOP;
else if (strcasecmp(strval, "Left") == 0)
m_value = FbWinFrame::LEFT;
else if (strcasecmp(strval, "LeftBottom") == 0)
m_value = FbWinFrame::LEFTBOTTOM;
else if (strcasecmp(strval, "RightTop") == 0)
m_value = FbWinFrame::RIGHTTOP;
else if (strcasecmp(strval, "Right") == 0)
m_value = FbWinFrame::RIGHT;
else if (strcasecmp(strval, "RightBottom") == 0)
m_value = FbWinFrame::RIGHTBOTTOM;
else
setDefaultValue(); setDefaultValue();
} }
@ -1650,40 +1620,39 @@ void BScreen::setupConfigmenu(FbTk::Menu &menu) {
tab_width_item->setCommand(save_and_reconftabs); tab_width_item->setCommand(save_and_reconftabs);
tab_menu->insert(tab_width_item); tab_menu->insert(tab_width_item);
typedef pair<FbTk::FbString, FbWinFrame::TabPlacement> PlacementP;
typedef list<PlacementP> Placements;
Placements place_menu;
// menu is 3 wide, 5 down // menu is 3 wide, 5 down
place_menu.push_back(PlacementP(_FB_XTEXT(Align, TopLeft, "Top Left", "Top Left"), FbWinFrame::TOPLEFT)); struct PlacementP {
place_menu.push_back(PlacementP(_FB_XTEXT(Align, LeftTop, "Left Top", "Left Top"), FbWinFrame::LEFTTOP)); const FbTk::FbString label;
place_menu.push_back(PlacementP(_FB_XTEXT(Align, LeftCenter, "Left Center", "Left Center"), FbWinFrame::LEFT)); FbWinFrame::TabPlacement placement;
place_menu.push_back(PlacementP(_FB_XTEXT(Align, LeftBottom, "Left Bottom", "Left Bottom"), FbWinFrame::LEFTBOTTOM)); };
place_menu.push_back(PlacementP(_FB_XTEXT(Align, BottomLeft, "Bottom Left", "Bottom Left"), FbWinFrame::BOTTOMLEFT)); static const PlacementP place_menu[] = {
place_menu.push_back(PlacementP(_FB_XTEXT(Align, TopCenter, "Top Center", "Top Center"), FbWinFrame::TOP));
place_menu.push_back(PlacementP("", FbWinFrame::TOPLEFT)); { _FB_XTEXT(Align, TopLeft, "Top Left", "Top Left"), FbWinFrame::TOPLEFT},
place_menu.push_back(PlacementP("", FbWinFrame::TOPLEFT)); { _FB_XTEXT(Align, LeftTop, "Left Top", "Left Top"), FbWinFrame::LEFTTOP},
place_menu.push_back(PlacementP("", FbWinFrame::TOPLEFT)); { _FB_XTEXT(Align, LeftCenter, "Left Center", "Left Center"), FbWinFrame::LEFT},
place_menu.push_back(PlacementP(_FB_XTEXT(Align, BottomCenter, "Bottom Center", "Bottom Center"), FbWinFrame::BOTTOM)); { _FB_XTEXT(Align, LeftBottom, "Left Bottom", "Left Bottom"), FbWinFrame::LEFTBOTTOM},
place_menu.push_back(PlacementP(_FB_XTEXT(Align, TopRight, "Top Right", "Top Right"), FbWinFrame::TOPRIGHT)); { _FB_XTEXT(Align, BottomLeft, "Bottom Left", "Bottom Left"), FbWinFrame::BOTTOMLEFT},
place_menu.push_back(PlacementP(_FB_XTEXT(Align, RightTop, "Right Top", "Right Top"), FbWinFrame::RIGHTTOP)); { _FB_XTEXT(Align, TopCenter, "Top Center", "Top Center"), FbWinFrame::TOP},
place_menu.push_back(PlacementP(_FB_XTEXT(Align, RightCenter, "Right Center", "Right Center"), FbWinFrame::RIGHT)); { "", FbWinFrame::TOPLEFT},
place_menu.push_back(PlacementP(_FB_XTEXT(Align, RightBottom, "Right Bottom", "Right Bottom"), FbWinFrame::RIGHTBOTTOM)); { "", FbWinFrame::TOPLEFT},
place_menu.push_back(PlacementP(_FB_XTEXT(Align, BottomRight, "Bottom Right", "Bottom Right"), FbWinFrame::BOTTOMRIGHT)); { "", FbWinFrame::TOPLEFT},
{ _FB_XTEXT(Align, BottomCenter, "Bottom Center", "Bottom Center"), FbWinFrame::BOTTOM},
{ _FB_XTEXT(Align, TopRight, "Top Right", "Top Right"), FbWinFrame::TOPRIGHT},
{ _FB_XTEXT(Align, RightTop, "Right Top", "Right Top"), FbWinFrame::RIGHTTOP},
{ _FB_XTEXT(Align, RightCenter, "Right Center", "Right Center"), FbWinFrame::RIGHT},
{ _FB_XTEXT(Align, RightBottom, "Right Bottom", "Right Bottom"), FbWinFrame::RIGHTBOTTOM},
{ _FB_XTEXT(Align, BottomRight, "Bottom Right", "Bottom Right"), FbWinFrame::BOTTOMRIGHT}
};
tabplacement_menu->setMinimumSublevels(3); tabplacement_menu->setMinimumSublevels(3);
// create items in sub menu // create items in sub menu
for (size_t i=0; i<15; ++i) { for (size_t i=0; i< sizeof(place_menu)/sizeof(PlacementP); ++i) {
FbTk::FbString &str = place_menu.front().first; const PlacementP& p = place_menu[i];
FbWinFrame::TabPlacement placement = place_menu.front().second; if (p.label == "") {
if (str == "") { tabplacement_menu->insert(p.label);
tabplacement_menu->insert("");
tabplacement_menu->setItemEnabled(i, false); tabplacement_menu->setItemEnabled(i, false);
} else { } else
tabplacement_menu->insert(new TabPlacementMenuItem(str, *this, placement, save_and_reconftabs)); tabplacement_menu->insert(new TabPlacementMenuItem(p.label, *this, p.placement, save_and_reconftabs));
}
place_menu.pop_front();
} }
tabplacement_menu->updateMenu(); tabplacement_menu->updateMenu();