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

fixed issue with clientUp/Down in SlitClientMenu

Browse source
This commit is contained in:
mathias 2004-12-06 22:09:58 +00:00
parent e6f9968151
commit 253082dbfa
1 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/Slit.cc
View file

@ -910,11 +910,17 @@ void Slit::clientUp(SlitClient* client) {
if (!client || m_client_list.size() < 2) if (!client || m_client_list.size() < 2)
return; return;
if (client == m_client_list.front()) {
cycleClientsUp();
return;
}
SlitClients::iterator it = m_client_list.begin(); SlitClients::iterator it = m_client_list.begin();
for(it++; it != m_client_list.end(); it++) { for(it++; it != m_client_list.end(); it++) {
if ((*it) == client) { if ((*it) == client) {
swap(*it, *(it--)); SlitClients::iterator prev = it;
prev--;
iter_swap(it, prev);
reconfigure(); reconfigure();
break; break;
} }
@ -924,11 +930,18 @@ void Slit::clientUp(SlitClient* client) {
void Slit::clientDown(SlitClient* client) { void Slit::clientDown(SlitClient* client) {
if (!client || m_client_list.size() < 2) if (!client || m_client_list.size() < 2)
return; return;
if (client == m_client_list.back()) {
cycleClientsDown();
return;
}
SlitClients::reverse_iterator it = m_client_list.rbegin(); SlitClients::reverse_iterator it = m_client_list.rbegin();
for(it++; it != m_client_list.rend(); it++) { for(it++; it != m_client_list.rend(); it++) {
if ((*it) == client) { if ((*it) == client) {
swap(*it, *(it--)); SlitClients::reverse_iterator next = it;
next--;
iter_swap(it, next);
reconfigure(); reconfigure();
break; break;
} }
@ -1161,7 +1174,7 @@ void Slit::updateClientmenu() {
"Save SlitList", "Saves the current order in the slit"), "Save SlitList", "Saves the current order in the slit"),
savecmd); savecmd);
m_clientlist_menu.update(); m_clientlist_menu.updateMenu();
} }
void Slit::saveClientList() { void Slit::saveClientList() {
@ -1258,7 +1271,7 @@ void Slit::setupMenu() {
*this, *this,
save_and_reconfigure)); save_and_reconfigure));
m_slitmenu.insert(_FBTEXT(Slit, ClientsMenu, "Clients", "Slit client menu"), &m_clientlist_menu); m_slitmenu.insert(_FBTEXT(Slit, ClientsMenu, "Clients", "Slit client menu"), &m_clientlist_menu);
m_slitmenu.update(); m_slitmenu.updateMenu();
// setup sub menu // setup sub menu
m_placement_menu.setLabel(_FBTEXT(Slit, Placement, "Slit Placement", "Slit Placement")); m_placement_menu.setLabel(_FBTEXT(Slit, Placement, "Slit Placement", "Slit Placement"));
@ -1300,7 +1313,7 @@ void Slit::setupMenu() {
} }
// finaly update sub menu // finaly update sub menu
m_placement_menu.update(); m_placement_menu.updateMenu();
} }
void Slit::moveToLayer(int layernum) { void Slit::moveToLayer(int layernum) {