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

fix detachClient issue where the menu wouldn't get created before adding

Browse source 
remember. Also make this safer in Remember.cc
This commit is contained in:
rathnor 2003-04-28 12:58:08 +00:00
parent 93fab45acc
commit af8510a5a7
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Remember.cc
View file

@ -20,7 +20,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Remember.cc,v 1.9 2003/04/27 15:53:53 rathnor Exp $ // $Id: Remember.cc,v 1.10 2003/04/28 12:58:08 rathnor Exp $
#include "Remember.hh" #include "Remember.hh"
#include "StringUtil.hh" #include "StringUtil.hh"
@ -545,12 +545,14 @@ void Remember::setupWindow(FluxboxWindow &win) {
// we don't touch the window if it is a transient // we don't touch the window if it is a transient
// of something else // of something else
int menupos = win.getWindowmenu().numberOfItems()-2;
if (menupos < -1) menupos = -1;
if (winclient.transientFor()) { if (winclient.transientFor()) {
// still put something in the menu so people don't get confused // still put something in the menu so people don't get confused
// so, we add a disabled item... // so, we add a disabled item...
FbTk::MenuItem *item = new FbTk::MenuItem("Remember..."); FbTk::MenuItem *item = new FbTk::MenuItem("Remember...");
item->setEnabled(false); item->setEnabled(false);
win.getWindowmenu().insert(item, win.getWindowmenu().numberOfItems()-2); win.getWindowmenu().insert(item, menupos);
win.getWindowmenu().update(); win.getWindowmenu().update();
return; return;
} }
@ -560,7 +562,7 @@ void Remember::setupWindow(FluxboxWindow &win) {
// TODO: nls // TODO: nls
win.getWindowmenu().insert("Remember...", win.getWindowmenu().insert("Remember...",
createRememberMenu(*this, win), createRememberMenu(*this, win),
win.getWindowmenu().numberOfItems()-2); menupos);
win.getWindowmenu().update(); win.getWindowmenu().update();
Application *app = find(winclient); Application *app = find(winclient);

4
src/Screen.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Screen.cc,v 1.140 2003/04/28 00:36:50 fluxgen Exp $ // $Id: Screen.cc,v 1.141 2003/04/28 12:58:08 rathnor Exp $
#include "Screen.hh" #include "Screen.hh"
@ -1291,8 +1291,8 @@ FluxboxWindow *BScreen::createWindow(WinClient &client) {
// WinClient already exists). // WinClient already exists).
Fluxbox::instance()->saveWindowSearch(client.window(), win); Fluxbox::instance()->saveWindowSearch(client.window(), win);
Fluxbox::instance()->attachSignals(*win);
setupWindowActions(*win); setupWindowActions(*win);
Fluxbox::instance()->attachSignals(*win);
if (win->getWorkspaceNumber() == getCurrentWorkspaceID() || win->isStuck()) { if (win->getWorkspaceNumber() == getCurrentWorkspaceID() || win->isStuck()) {
win->show(); win->show();
} }