diff options
| author | Ken Moore <moorekou@gmail.com> | 2015-07-09 15:00:27 -0400 |
|---|---|---|
| committer | Ken Moore <moorekou@gmail.com> | 2015-07-09 15:00:27 -0400 |
| commit | 3d0e41187dbb2e1328972576c3e8d3c0b2f4155f (patch) | |
| tree | 2a5e0e1ec2820a0833b454643eceed2762e7b4da | |
| parent | Expand the QtQuick plugin format and put a couple more functions for finding/... (diff) | |
| download | lumina-3d0e41187dbb2e1328972576c3e8d3c0b2f4155f.tar.gz lumina-3d0e41187dbb2e1328972576c3e8d3c0b2f4155f.tar.bz2 lumina-3d0e41187dbb2e1328972576c3e8d3c0b2f4155f.zip | |
Clean up some extra debugging in the lumina-desktop
| -rw-r--r-- | lumina-desktop/LSession.cpp | 5 | ||||
| -rw-r--r-- | lumina-desktop/desktop-plugins/LDPlugin.cpp | 2 | ||||
| -rw-r--r-- | lumina-desktop/desktop-plugins/LDPluginContainer.h | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/lumina-desktop/LSession.cpp b/lumina-desktop/LSession.cpp index 99789ea3..aa1c1e0c 100644 --- a/lumina-desktop/LSession.cpp +++ b/lumina-desktop/LSession.cpp @@ -340,6 +340,9 @@ void LSession::checkUserFiles(){ if(newversion || newrelease){ LUtils::upgradeFavorites(oldversion); } + //Remove/convert any old desktop plugin files (Change occured with 0.8.5) + // - TO-DO + //Convert to the XDG autostart spec as necessary (Change occured with 0.8.5) if(QFile::exists(QDir::homePath()+"/.lumina/startapps") ){ QStringList cmds = LUtils::readFile(QDir::homePath()+"/.lumina/startapps"); @@ -481,7 +484,7 @@ 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){ + if(geom.bottom() > desk.bottom() && geom.height() > 10){ //Also adjust the sizing for the frame (the moveResize fuction is for the base window only) geom.setBottom(desk.bottom()-frame[0]-frame[1]); } diff --git a/lumina-desktop/desktop-plugins/LDPlugin.cpp b/lumina-desktop/desktop-plugins/LDPlugin.cpp index 5db20232..cc07b747 100644 --- a/lumina-desktop/desktop-plugins/LDPlugin.cpp +++ b/lumina-desktop/desktop-plugins/LDPlugin.cpp @@ -22,7 +22,7 @@ void LDPlugin::setInitialSize(int width, int height){ // if the plugin is completely new (first time used), it will be this size if(settings->allKeys().filter(prefix+"location").isEmpty()){ //Brand new plugin: set initial size - qDebug() << "Setting Initial Size:" << PLUGID << width << height; + //qDebug() << "Setting Initial Size:" << PLUGID << width << height; settings->setValue(prefix+"location/width",width); settings->setValue(prefix+"location/height",height); settings->sync(); diff --git a/lumina-desktop/desktop-plugins/LDPluginContainer.h b/lumina-desktop/desktop-plugins/LDPluginContainer.h index da8ead6e..0bf40873 100644 --- a/lumina-desktop/desktop-plugins/LDPluginContainer.h +++ b/lumina-desktop/desktop-plugins/LDPluginContainer.h @@ -86,7 +86,7 @@ public: public slots: void loadInitialPosition(){ QRect set(PLUG->readSetting("location/x",-12345).toInt(), PLUG->readSetting("location/y",-12345).toInt(), PLUG->readSetting("location/width",PLUG->size().width()).toInt() +4, PLUG->readSetting("location/height",PLUG->size().height()).toInt()+4); - qDebug() << "Initial Plugin Location:" << set.x() << set.y() << set.width() << set.height(); + //qDebug() << "Initial Plugin Location:" << set.x() << set.y() << set.width() << set.height(); if(set.height() < 10){ set.setHeight(10); } //to prevent foot-shooting if(set.width() < 10){ set.setWidth(10); } //to prevent foot-shooting /*if(!locked){ |