diff options
| author | Ken Moore <moorekou@gmail.com> | 2015-11-23 08:27:54 -0500 |
|---|---|---|
| committer | Ken Moore <moorekou@gmail.com> | 2015-11-23 08:27:54 -0500 |
| commit | b3eeb75b78ad7c1597e6557f0da7097400fc8fe3 (patch) | |
| tree | ed32ad9c0f60960c95ad027d813f56771a7687ce /lumina-desktop | |
| parent | Fix a typo in the backend variable name for custom panel colors. (diff) | |
| parent | Fix up the window minimization routines and the window margins for the embedd... (diff) | |
| download | lumina-b3eeb75b78ad7c1597e6557f0da7097400fc8fe3.tar.gz lumina-b3eeb75b78ad7c1597e6557f0da7097400fc8fe3.tar.bz2 lumina-b3eeb75b78ad7c1597e6557f0da7097400fc8fe3.zip | |
Merge branch 'master' of github.com:pcbsd/lumina
Diffstat (limited to 'lumina-desktop')
| -rw-r--r-- | lumina-desktop/LSession.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lumina-desktop/LSession.cpp b/lumina-desktop/LSession.cpp index 7f182583..9fd30b7d 100644 --- a/lumina-desktop/LSession.cpp +++ b/lumina-desktop/LSession.cpp @@ -162,7 +162,8 @@ void LSession::setupSession(){ connect(this, SIGNAL(aboutToQuit()), this, SLOT(SessionEnding()) ); if(DEBUG){ qDebug() << " - Init Finished:" << timer->elapsed(); delete timer;} QApplication::processEvents(); - QTimer::singleShot(500, this, SLOT(launchStartupApps()) ); + launchStartupApps(); + //QTimer::singleShot(500, this, SLOT(launchStartupApps()) ); QApplication::processEvents(); splash.close(); } @@ -576,7 +577,7 @@ void LSession::adjustWindowGeom(WId win, bool maximize){ break; } } - if(desk.isNull()){ return; } //Unable to deteremine screen + if(desk.isNull()){ return; } //Unable to determine screen //Adjust the window location if necessary if(maximize){ if(DEBUG){ qDebug() << " - Maximizing New Window:" << desk.width() << desk.height(); } @@ -599,7 +600,7 @@ void LSession::adjustWindowGeom(WId win, bool maximize){ //just move the window - there is room for it above geom.setBottom(desk.bottom()-frame[1]); fgeom.setBottom(desk.bottom()); - }else if(geom.height() < diff){ //window bigger than the difference + }else if(geom.height() > diff){ //window bigger than the difference //Need to resize the window - keeping the origin point the same geom.setHeight( geom.height()-diff-1 ); //shrink it by the difference (need an extra pixel somewhere) fgeom.setHeight( fgeom.height()-diff ); |