minor cleaning, moved first resize move of frame
This commit is contained in:
parent
18d479afb3
commit
588897315c
1 changed files with 12 additions and 12 deletions
|
@ -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.124 2003/02/22 18:28:32 fluxgen Exp $
|
// $Id: Window.cc,v 1.125 2003/02/22 21:40:35 fluxgen Exp $
|
||||||
|
|
||||||
#include "Window.hh"
|
#include "Window.hh"
|
||||||
|
|
||||||
|
@ -101,16 +101,16 @@ typedef struct scanargs {
|
||||||
|
|
||||||
// look for valid enter or leave events (that may invalidate the earlier one we are interested in)
|
// look for valid enter or leave events (that may invalidate the earlier one we are interested in)
|
||||||
static Bool queueScanner(Display *, XEvent *e, char *args) {
|
static Bool queueScanner(Display *, XEvent *e, char *args) {
|
||||||
if ((e->type == LeaveNotify) &&
|
if (e->type == LeaveNotify &&
|
||||||
(e->xcrossing.window == ((scanargs *) args)->w) &&
|
e->xcrossing.window == ((scanargs *) args)->w &&
|
||||||
(e->xcrossing.mode == NotifyNormal)) {
|
e->xcrossing.mode == NotifyNormal) {
|
||||||
((scanargs *) args)->leave = True;
|
((scanargs *) args)->leave = true;
|
||||||
((scanargs *) args)->inferior = (e->xcrossing.detail == NotifyInferior);
|
((scanargs *) args)->inferior = (e->xcrossing.detail == NotifyInferior);
|
||||||
} else if ((e->type == EnterNotify) &&
|
} else if (e->type == EnterNotify &&
|
||||||
(e->xcrossing.mode == NotifyUngrab))
|
e->xcrossing.mode == NotifyUngrab)
|
||||||
((scanargs *) args)->enter = True;
|
((scanargs *) args)->enter = true;
|
||||||
|
|
||||||
return False;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// raise window and do the same for each transient it holds
|
/// raise window and do the same for each transient it holds
|
||||||
|
@ -277,6 +277,9 @@ FluxboxWindow::FluxboxWindow(Window w, BScreen *s, int screen_num,
|
||||||
|
|
||||||
upsize();
|
upsize();
|
||||||
|
|
||||||
|
m_frame.move(wattrib.x, wattrib.y);
|
||||||
|
m_frame.resizeForClient(wattrib.width, wattrib.height);
|
||||||
|
|
||||||
bool place_window = true;
|
bool place_window = true;
|
||||||
if (fluxbox->isStartup() || transient ||
|
if (fluxbox->isStartup() || transient ||
|
||||||
client.normal_hint_flags & (PPosition|USPosition)) {
|
client.normal_hint_flags & (PPosition|USPosition)) {
|
||||||
|
@ -314,9 +317,6 @@ FluxboxWindow::FluxboxWindow(Window w, BScreen *s, int screen_num,
|
||||||
|
|
||||||
positionWindows();
|
positionWindows();
|
||||||
|
|
||||||
m_frame.move(wattrib.x, wattrib.y);
|
|
||||||
m_frame.resizeForClient(wattrib.width, wattrib.height);
|
|
||||||
|
|
||||||
if (workspace_number < 0 || workspace_number >= screen->getCount())
|
if (workspace_number < 0 || workspace_number >= screen->getCount())
|
||||||
workspace_number = screen->getCurrentWorkspaceID();
|
workspace_number = screen->getCurrentWorkspaceID();
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue