vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Plasma/5.2'

icc-effect-5.14.5
Hrvoje Senjan 2015-03-13 15:52:24 +01:00
parent 3458dcb23f 9bddd0fe8a
commit 3b1f345f4d
5 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client.cpp
View File

@ -461,9 +461,9 @@ void Client::destroyDecoration()
{
QRect oldgeom = geometry();
if (m_decoration) {
QPoint grav = calculateGravitation(true);
delete m_decoration;
m_decoration = nullptr;
QPoint grav = calculateGravitation(true);
plainResize(sizeForClientSize(clientSize()), ForceGeometrySet);
move(grav);
if (compositing())

10
effects/presentwindows/presentwindows.cpp
View File

@ -132,6 +132,10 @@ void PresentWindowsEffect::reconfigure(ReconfigureFlags)
m_showCaptions = PresentWindowsConfig::drawWindowCaptions();
m_showIcons = PresentWindowsConfig::drawWindowIcons();
m_doNotCloseWindows = !PresentWindowsConfig::allowClosingWindows();
if (m_doNotCloseWindows) {
delete m_closeView;
m_closeView = nullptr;
}
m_ignoreMinimized = PresentWindowsConfig::ignoreMinimized();
m_accuracy = PresentWindowsConfig::accuracy() * 20;
m_fillGaps = PresentWindowsConfig::fillGaps();
@ -1421,7 +1425,7 @@ void PresentWindowsEffect::setActive(bool active)
m_highlightedWindow = NULL;
m_windowFilter.clear();
if (!m_doNotCloseWindows) {
if (!(m_doNotCloseWindows || m_closeView)) {
m_closeView = new CloseWindowView();
connect(m_closeView, &CloseWindowView::requestClose, this, &PresentWindowsEffect::closeWindow);
}
@ -1505,8 +1509,8 @@ void PresentWindowsEffect::setActive(bool active)
winData->visible = (w->isOnDesktop(desktop) || w->isOnAllDesktops()) &&
!w->isMinimized() && (w->isCurrentTab() || winData->visible);
}
delete m_closeView;
m_closeView = 0;
if (m_closeView)
m_closeView->hide();
// Move all windows back to their original position
foreach (EffectWindow * w, m_motionManager.managedWindows())

4
kcmkwin/kwincompositing/kwineffect.knsrc
View File

@ -2,5 +2,5 @@
ProvidersUrl=http://download.kde.org/ocs/providers.xml
Categories=KWin Effects
StandardResource=tmp
InstallationCommand=plasmapkg -t kwineffect -i %f
UninstallCommand=plasmapkg -t kwineffect -r %f
InstallationCommand=plasmapkg2 -t kwineffect -i %f
UninstallCommand=plasmapkg2 -t kwineffect -r %f

4
kcmkwin/kwinscripts/kwinscripts.knsrc
View File

@ -2,5 +2,5 @@
ProvidersUrl=http://download.kde.org/ocs/providers.xml
Categories=KWin Scripts
StandardResource=tmp
InstallationCommand=plasmapkg -t kwinscript -i %f
UninstallCommand=plasmapkg -t kwinscript -r %f
InstallationCommand=plasmapkg2 -t kwinscript -i %f
UninstallCommand=plasmapkg2 -t kwinscript -r %f

4
kcmkwin/kwintabbox/kwinswitcher.knsrc
View File

@ -2,5 +2,5 @@
ProvidersUrl=http://download.kde.org/ocs/providers.xml
Categories=KWin Switching Layouts
StandardResource=tmp
InstallationCommand=plasmapkg -t windowswitcher -i %f
UninstallCommand=plasmapkg -t windowswitcher -r %f
InstallationCommand=plasmapkg2 -t windowswitcher -i %f
UninstallCommand=plasmapkg2 -t windowswitcher -r %f