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

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

Browse source
This commit is contained in:
fluxgen 2004-08-10 19:18:48 +00:00
parent 1a02439df1
commit f223711cf1
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/Window.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: Window.cc,v 1.294 2004/08/10 12:05:47 fluxgen Exp $ // $Id: Window.cc,v 1.295 2004/08/10 19:18:48 fluxgen Exp $
#include "Window.hh" #include "Window.hh"
@ -575,7 +575,10 @@ void FluxboxWindow::init() {
if (m_shaped) if (m_shaped)
shape(); shape();
FbTk::App::instance()->sync(false);
setupWindow();
FbTk::App::instance()->sync(false);
} }
/// apply shape to this window /// apply shape to this window
@ -3410,7 +3413,7 @@ void FluxboxWindow::addExtraMenu(const char *label, FbTk::Menu *menu) {
menu->disableTitle(); menu->disableTitle();
m_extramenus.push_back(std::make_pair(label, menu)); m_extramenus.push_back(std::make_pair(label, menu));
setupWindow(); setupMenu();
} }
void FluxboxWindow::removeExtraMenu(FbTk::Menu *menu) { void FluxboxWindow::removeExtraMenu(FbTk::Menu *menu) {
@ -3422,7 +3425,7 @@ void FluxboxWindow::removeExtraMenu(FbTk::Menu *menu) {
break; break;
} }
} }
setupWindow(); setupMenu();
} }
void FluxboxWindow::close() { void FluxboxWindow::close() {
@ -3524,6 +3527,10 @@ void FluxboxWindow::setupWindow() {
// end setup frame // end setup frame
setupMenu();
}
void FluxboxWindow::setupMenu() {
// setup menu // setup menu
menu().removeAll(); // clear old items menu().removeAll(); // clear old items

3
src/Window.hh
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: Window.hh,v 1.117 2004/08/10 12:05:47 fluxgen Exp $ // $Id: Window.hh,v 1.118 2004/08/10 19:18:47 fluxgen Exp $
#ifndef WINDOW_HH #ifndef WINDOW_HH
#define WINDOW_HH #define WINDOW_HH
@ -384,6 +384,7 @@ private:
static const int PropBlackboxAttributesElements = 8; static const int PropBlackboxAttributesElements = 8;
void setupWindow(); void setupWindow();
void setupMenu();
void init(); void init();
/// applies a shape mask to the window if it has one /// applies a shape mask to the window if it has one