From 33a6682d5fc51415f270ebe96989649e8c792c52 Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@pcbsd.org>
Date: Wed, 21 Jan 2015 11:53:20 -0500
Subject: Clean up a couple other session options: 1) Fix the "Open Home Dir"
 option in the application menu. 2) Have the logout window open on the current
 screen (instead of always the left screen) 3) Hide the logout window when
 starting the logout procedure.

---
 lumina-desktop/AppMenu.cpp                                       | 2 +-
 lumina-desktop/LSession.cpp                                      | 1 +
 lumina-desktop/SystemWindow.cpp                                  | 8 ++++++--
 lumina-desktop/desktop-plugins/desktopview/DesktopViewPlugin.cpp | 1 +
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/lumina-desktop/AppMenu.cpp b/lumina-desktop/AppMenu.cpp
index ab8dc4a9..8736b61e 100644
--- a/lumina-desktop/AppMenu.cpp
+++ b/lumina-desktop/AppMenu.cpp
@@ -111,7 +111,7 @@ void AppMenu::launchControlPanel(){
 }
 
 void AppMenu::launchFileManager(){
-  QString fm = LSession::handle()->sessionSettings()->value("default-filemanager","lumina-fm").toString();
+  QString fm = "lumina-open \""+QDir::homePath()+"\"";
   LSession::LaunchApplication(fm);
 }
 
diff --git a/lumina-desktop/LSession.cpp b/lumina-desktop/LSession.cpp
index dc2bf04d..bdf2b53a 100644
--- a/lumina-desktop/LSession.cpp
+++ b/lumina-desktop/LSession.cpp
@@ -35,6 +35,7 @@ LSession::LSession(int &argc, char ** argv) : QApplication(argc, argv){
   this->setEffectEnabled( Qt::UI_AnimateMenu, true);
   this->setEffectEnabled( Qt::UI_AnimateCombo, true);
   this->setEffectEnabled( Qt::UI_AnimateTooltip, true);
+  this->setAttribute(Qt::AA_UseHighDpiPixmaps); //allow pixmaps to be scaled up as well as down
   //this->setStyle( new MenuProxyStyle); //QMenu icon size override
   SystemTrayID = 0; VisualTrayID = 0;
   TrayDmgEvent = 0;
diff --git a/lumina-desktop/SystemWindow.cpp b/lumina-desktop/SystemWindow.cpp
index bec15850..15268e0b 100644
--- a/lumina-desktop/SystemWindow.cpp
+++ b/lumina-desktop/SystemWindow.cpp
@@ -4,6 +4,8 @@
 #include "LSession.h"
 #include <LuminaOS.h>
 #include <unistd.h> //for usleep() usage
+#include <QPoint>
+#include <QCursor>
 
 SystemWindow::SystemWindow() : QDialog(), ui(new Ui::SystemWindow){
   ui->setupUi(this); //load the designer file
@@ -27,8 +29,8 @@ SystemWindow::SystemWindow() : QDialog(), ui(new Ui::SystemWindow){
     ui->tool_shutdown->setEnabled(false);
   }
   //Center this window on the screen
-  QDesktopWidget desktop;
-  this->move(desktop.screenGeometry().width()/2 - this->width()/2, desktop.screenGeometry().height()/2 - this->height()/2);
+  QPoint center = QApplication::desktop()->screenGeometry(QCursor::pos()).center(); //get the center of the current screen
+  this->move(center.x() - this->width()/2, center.y() - this->height()/2);
   this->show();
 }
 
@@ -37,6 +39,8 @@ SystemWindow::~SystemWindow(){
 }
 
 void SystemWindow::closeAllWindows(){
+  this->hide();
+  LSession::processEvents();
   if( LSession::handle()->sessionSettings()->value("PlayLogoutAudio",true).toBool() ){
     LSession::handle()->playAudioFile(LOS::LuminaShare()+"Logout.ogg");
   }
diff --git a/lumina-desktop/desktop-plugins/desktopview/DesktopViewPlugin.cpp b/lumina-desktop/desktop-plugins/desktopview/DesktopViewPlugin.cpp
index ddf504b4..a96358e7 100644
--- a/lumina-desktop/desktop-plugins/desktopview/DesktopViewPlugin.cpp
+++ b/lumina-desktop/desktop-plugins/desktopview/DesktopViewPlugin.cpp
@@ -20,6 +20,7 @@ DesktopViewPlugin::DesktopViewPlugin(QWidget* parent, QString ID) : LDPlugin(par
     list->setSelectionMode(QAbstractItemView::NoSelection);
     list->setStyleSheet( "QListWidget{ background: transparent; border: none; }" );
     list->setIconSize(QSize(64,64));
+    list->setUniformItemSizes(true);
   this->layout()->addWidget(list);
   this->setInitialSize(200,300);
   watcher = new QFileSystemWatcher(this);
-- 
cgit