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

fixed toolbar draw bug at startup

Browse source
This commit is contained in:
fluxgen 2004-07-14 23:39:29 +00:00
parent 7391de5e96
commit b78255fa1a
2 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Toolbar.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
// $Id: Toolbar.cc,v 1.146 2004/06/21 15:23:42 rathnor Exp $
// $Id: Toolbar.cc,v 1.147 2004/07/14 23:39:29 fluxgen Exp $
#include "Toolbar.hh"
@ -260,7 +260,7 @@ Toolbar::Toolbar(BScreen &scrn, FbTk::XLayer &layer, size_t width):
// show all windows
frame.window.showSubwindows();
frame.window.show();
// frame.window.show();
scrn.resourceManager().unlock();
// setup to listen to child events
@ -351,7 +351,7 @@ void Toolbar::lower() {
}
void Toolbar::reconfigure() {
updateVisibleState();
// updateVisibleState();
if (!doAutoHide() && isHidden())
toggleHidden();

24
src/fluxbox.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
// $Id: fluxbox.cc,v 1.245 2004/06/21 15:23:42 rathnor Exp $
// $Id: fluxbox.cc,v 1.246 2004/07/14 23:38:53 fluxgen Exp $
#include "fluxbox.hh"
@ -592,6 +592,7 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
screen->slit()->show();
#endif // SLIT
} // end init screens
XAllowEvents(disp, ReplayPointer, CurrentTime);
@ -627,6 +628,15 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
// FbTk::ThemeManager::instance().listItems();
//
// m_resourcemanager.dump();
#ifdef USE_TOOLBAR
// finally, show toolbar
Toolbars::iterator toolbar_it = m_toolbars.begin();
Toolbars::iterator toolbar_it_end = m_toolbars.end();
for (; toolbar_it != toolbar_it_end; ++toolbar_it)
(*toolbar_it)->updateVisibleState();
#endif // USE_TOOLBAR
}
@ -692,6 +702,7 @@ void Fluxbox::grab() {
void Fluxbox::ungrab() {
if (! --m_server_grabs)
XUngrabServer(display());
if (m_server_grabs < 0)
m_server_grabs = 0;
}
@ -860,6 +871,7 @@ void Fluxbox::handleEvent(XEvent * const e) {
#ifdef DEBUG
cerr<<"MapRequest for 0x"<<hex<<e->xmaprequest.window<<dec<<endl;
#endif // DEBUG
WinClient *winclient = searchWindow(e->xmaprequest.window);
@ -900,9 +912,9 @@ void Fluxbox::handleEvent(XEvent * const e) {
win->mapRequestEvent(e->xmaprequest);
}
break;
case MapNotify: {
case MapNotify:
// handled directly in FluxboxWindow::handleEvent
} break;
break;
case UnmapNotify:
handleUnmapNotify(e->xunmap);
break;
@ -951,6 +963,7 @@ void Fluxbox::handleEvent(XEvent * const e) {
}
} break;
case EnterNotify: {
m_last_time = e->xcrossing.time;
BScreen *screen = 0;
@ -965,6 +978,7 @@ void Fluxbox::handleEvent(XEvent * const e) {
} break;
case LeaveNotify:
m_last_time = e->xcrossing.time;
break;
case Expose:
@ -995,7 +1009,6 @@ void Fluxbox::handleEvent(XEvent * const e) {
} break;
case FocusOut:{
// and here we ignore some window losing the special grab focus
if (e->xfocus.mode == NotifyGrab ||
e->xfocus.detail == NotifyPointer ||
@ -1018,6 +1031,7 @@ void Fluxbox::handleEvent(XEvent * const e) {
handleClientMessage(e->xclient);
break;
default: {
#ifdef HAVE_RANDR
if (e->type == m_randr_event_type) {
// update root window size in screen
@ -1966,6 +1980,8 @@ void Fluxbox::setFocusedWindow(WinClient *client) {
}
#ifdef DEBUG
cerr<<"Setting Focused window = "<<client<<endl;
if (client != 0 && client->fbwindow() != 0)
cerr<<"title: "<<client->fbwindow()->title()<<endl;
cerr<<"Current Focused window = "<<m_focused_window<<endl;
cerr<<"------------------"<<endl;
#endif // DEBUG