aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Moore <ken@pcbsd.org>2015-06-22 08:08:37 -0400
committerKen Moore <ken@pcbsd.org>2015-06-22 08:08:37 -0400
commit7e96350c4000232b4780b4d24dea6fc013f17c9c (patch)
tree88c481e0afc6384116b896fd279a96da3905c24d
parentEnsure that "Lumina" is used for the XDG registrations instead of "LUMINA" (p... (diff)
parentFix up the adjustment of new windows to account for the frame (in the vertica... (diff)
downloadlumina-7e96350c4000232b4780b4d24dea6fc013f17c9c.tar.gz
lumina-7e96350c4000232b4780b4d24dea6fc013f17c9c.tar.bz2
lumina-7e96350c4000232b4780b4d24dea6fc013f17c9c.zip
Merge branch 'master' of github.com:pcbsd/lumina
-rw-r--r--lumina-desktop/LSession.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/lumina-desktop/LSession.cpp b/lumina-desktop/LSession.cpp
index 040c27de..dfbd88b5 100644
--- a/lumina-desktop/LSession.cpp
+++ b/lumina-desktop/LSession.cpp
@@ -509,7 +509,10 @@ void LSession::adjustWindowGeom(WId win, bool maximize){
if(geom.x() < desk.x()){ geom.moveLeft(desk.x()); } //move right to the edge (left panel)
//Adjust size for bottom margins (within reason, since window titles are on top normally)
// if(geom.right() > desk.right() && (geom.width() > 100)){ geom.setRight(desk.right()); }
- if(geom.bottom() > desk.bottom() && geom.height() > 100){ geom.setBottom(desk.bottom()); }
+ if(geom.bottom() > desk.bottom() && geom.height() > 100){
+ //Also adjust the sizing for the frame (the moveResize fuction is for the base window only)
+ geom.setBottom(desk.bottom()-frame[0]-frame[1]);
+ }
//Now move/resize the window
if(DEBUG){ qDebug() << " - New Geom:" << geom.x() << geom.y() << geom.width() << geom.height(); }
XCB->MoveResizeWindow(win, geom);
bgstack15