diff options
| author | q5sys <jt@obs-sec.com> | 2017-02-06 17:12:43 -0500 |
|---|---|---|
| committer | q5sys <jt@obs-sec.com> | 2017-02-06 17:12:43 -0500 |
| commit | 92b5b79d3f0f24a14552ed21874e94b8deb0f139 (patch) | |
| tree | 86892bde6dfb348cb39e58a1201266ef79dd5923 /src-qt5 | |
| parent | Get the templates for the material icon theme setup in the repo (no icons yet... (diff) | |
| download | lumina-92b5b79d3f0f24a14552ed21874e94b8deb0f139.tar.gz lumina-92b5b79d3f0f24a14552ed21874e94b8deb0f139.tar.bz2 lumina-92b5b79d3f0f24a14552ed21874e94b8deb0f139.zip | |
adding icons
Diffstat (limited to 'src-qt5')
| -rw-r--r-- | src-qt5/core/lumina-desktop/LDesktop.cpp | 7 | ||||
| -rw-r--r-- | src-qt5/desktop-utils/lumina-fm/MainUI.cpp | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src-qt5/core/lumina-desktop/LDesktop.cpp b/src-qt5/core/lumina-desktop/LDesktop.cpp index d4ebaa7f..92cef4d1 100644 --- a/src-qt5/core/lumina-desktop/LDesktop.cpp +++ b/src-qt5/core/lumina-desktop/LDesktop.cpp @@ -265,7 +265,7 @@ void LDesktop::SettingsChanged(){ UpdatePanels(); UpdateMenu(); issyncing = false; - QTimer::singleShot(100, this, SLOT(UnlockSettings()) ); //give it a few moments to settle before performing another sync + QTimer::singleShot(50, this, SLOT(UnlockSettings()) ); //give it a few moments to settle before performing another sync } void LDesktop::LocaleChanged(){ @@ -456,7 +456,7 @@ void LDesktop::UpdatePanels(){ } } //Give it a 1/2 second before ensuring that the visible desktop area is correct - QTimer::singleShot(500, this, SLOT(UpdateDesktopPluginArea()) ); + QTimer::singleShot(1500, this, SLOT(UpdateDesktopPluginArea()) ); } void LDesktop::UpdateDesktopPluginArea(){ @@ -484,7 +484,8 @@ void LDesktop::UpdateDesktopPluginArea(){ } //Now make sure the desktop plugin area is only the visible area QRect rec = visReg.boundingRect(); - //qDebug() << " - DPArea: Panel-Adjusted rectangle:" << rec; +// QRect rec = LSession::desktop()->availableGeometry(Screen()); + qDebug() << " - DPArea: Panel-Adjusted rectangle:" << rec; //LSession::handle()->XCB->SetScreenWorkArea((unsigned int) Screen(), rec); //Now remove the X offset to place it on the current screen (needs widget-coords, not global) globalWorkRect = rec; //save this for later diff --git a/src-qt5/desktop-utils/lumina-fm/MainUI.cpp b/src-qt5/desktop-utils/lumina-fm/MainUI.cpp index da3943a2..45ec860a 100644 --- a/src-qt5/desktop-utils/lumina-fm/MainUI.cpp +++ b/src-qt5/desktop-utils/lumina-fm/MainUI.cpp @@ -118,7 +118,7 @@ MainUI::~MainUI(){ } workThread->quit(); //Also ensure the work thread is stopped - workThread->wait(); +// workThread->wait(); } void MainUI::OpenDirs(QStringList dirs){ |