aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2004-08-10 19:18:48 (GMT)
committerfluxgen <fluxgen>2004-08-10 19:18:48 (GMT)
commitf223711cf1b5097c470d62d8db704e0b026b9afd (patch)
treedc3c9dff3985ad48c187c0864efaaffeb3ce27a6 /src
parent1a02439df1520a97e389a81a843df79d9b04e1d0 (diff)
downloadfluxbox_pavel-f223711cf1b5097c470d62d8db704e0b026b9afd.zip
fluxbox_pavel-f223711cf1b5097c470d62d8db704e0b026b9afd.tar.bz2
fixed so we call setupWindow last in init(), else we dont get anything in the titlebar if we dont have some special option like remember enabled
Diffstat (limited to 'src')
-rw-r--r--src/Window.cc15
-rw-r--r--src/Window.hh3
2 files changed, 13 insertions, 5 deletions
diff --git a/src/Window.cc b/src/Window.cc
index b02cc79..e97a821 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Window.cc,v 1.294 2004/08/10 12:05:47 fluxgen Exp $ 25// $Id: Window.cc,v 1.295 2004/08/10 19:18:48 fluxgen Exp $
26 26
27#include "Window.hh" 27#include "Window.hh"
28 28
@@ -575,7 +575,10 @@ void FluxboxWindow::init() {
575 575
576 if (m_shaped) 576 if (m_shaped)
577 shape(); 577 shape();
578 FbTk::App::instance()->sync(false); 578
579 setupWindow();
580
581 FbTk::App::instance()->sync(false);
579} 582}
580 583
581/// apply shape to this window 584/// apply shape to this window
@@ -3410,7 +3413,7 @@ void FluxboxWindow::addExtraMenu(const char *label, FbTk::Menu *menu) {
3410 menu->disableTitle(); 3413 menu->disableTitle();
3411 m_extramenus.push_back(std::make_pair(label, menu)); 3414 m_extramenus.push_back(std::make_pair(label, menu));
3412 3415
3413 setupWindow(); 3416 setupMenu();
3414} 3417}
3415 3418
3416void FluxboxWindow::removeExtraMenu(FbTk::Menu *menu) { 3419void FluxboxWindow::removeExtraMenu(FbTk::Menu *menu) {
@@ -3422,7 +3425,7 @@ void FluxboxWindow::removeExtraMenu(FbTk::Menu *menu) {
3422 break; 3425 break;
3423 } 3426 }
3424 } 3427 }
3425 setupWindow(); 3428 setupMenu();
3426} 3429}
3427 3430
3428void FluxboxWindow::close() { 3431void FluxboxWindow::close() {
@@ -3524,6 +3527,10 @@ void FluxboxWindow::setupWindow() {
3524 3527
3525 // end setup frame 3528 // end setup frame
3526 3529
3530 setupMenu();
3531}
3532
3533void FluxboxWindow::setupMenu() {
3527 // setup menu 3534 // setup menu
3528 3535
3529 menu().removeAll(); // clear old items 3536 menu().removeAll(); // clear old items
diff --git a/src/Window.hh b/src/Window.hh
index a271fb5..1b45d82 100644
--- a/src/Window.hh
+++ b/src/Window.hh
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Window.hh,v 1.117 2004/08/10 12:05:47 fluxgen Exp $ 25// $Id: Window.hh,v 1.118 2004/08/10 19:18:47 fluxgen Exp $
26 26
27#ifndef WINDOW_HH 27#ifndef WINDOW_HH
28#define WINDOW_HH 28#define WINDOW_HH
@@ -384,6 +384,7 @@ private:
384 static const int PropBlackboxAttributesElements = 8; 384 static const int PropBlackboxAttributesElements = 8;
385 385
386 void setupWindow(); 386 void setupWindow();
387 void setupMenu();
387 388
388 void init(); 389 void init();
389 /// applies a shape mask to the window if it has one 390 /// applies a shape mask to the window if it has one