Merge remote-tracking branch 'origin/Plasma/5.2'
commit
3b1f345f4d
|
@ -461,9 +461,9 @@ void Client::destroyDecoration()
|
||||||
{
|
{
|
||||||
QRect oldgeom = geometry();
|
QRect oldgeom = geometry();
|
||||||
if (m_decoration) {
|
if (m_decoration) {
|
||||||
|
QPoint grav = calculateGravitation(true);
|
||||||
delete m_decoration;
|
delete m_decoration;
|
||||||
m_decoration = nullptr;
|
m_decoration = nullptr;
|
||||||
QPoint grav = calculateGravitation(true);
|
|
||||||
plainResize(sizeForClientSize(clientSize()), ForceGeometrySet);
|
plainResize(sizeForClientSize(clientSize()), ForceGeometrySet);
|
||||||
move(grav);
|
move(grav);
|
||||||
if (compositing())
|
if (compositing())
|
||||||
|
|
|
@ -132,6 +132,10 @@ void PresentWindowsEffect::reconfigure(ReconfigureFlags)
|
||||||
m_showCaptions = PresentWindowsConfig::drawWindowCaptions();
|
m_showCaptions = PresentWindowsConfig::drawWindowCaptions();
|
||||||
m_showIcons = PresentWindowsConfig::drawWindowIcons();
|
m_showIcons = PresentWindowsConfig::drawWindowIcons();
|
||||||
m_doNotCloseWindows = !PresentWindowsConfig::allowClosingWindows();
|
m_doNotCloseWindows = !PresentWindowsConfig::allowClosingWindows();
|
||||||
|
if (m_doNotCloseWindows) {
|
||||||
|
delete m_closeView;
|
||||||
|
m_closeView = nullptr;
|
||||||
|
}
|
||||||
m_ignoreMinimized = PresentWindowsConfig::ignoreMinimized();
|
m_ignoreMinimized = PresentWindowsConfig::ignoreMinimized();
|
||||||
m_accuracy = PresentWindowsConfig::accuracy() * 20;
|
m_accuracy = PresentWindowsConfig::accuracy() * 20;
|
||||||
m_fillGaps = PresentWindowsConfig::fillGaps();
|
m_fillGaps = PresentWindowsConfig::fillGaps();
|
||||||
|
@ -1421,7 +1425,7 @@ void PresentWindowsEffect::setActive(bool active)
|
||||||
m_highlightedWindow = NULL;
|
m_highlightedWindow = NULL;
|
||||||
m_windowFilter.clear();
|
m_windowFilter.clear();
|
||||||
|
|
||||||
if (!m_doNotCloseWindows) {
|
if (!(m_doNotCloseWindows || m_closeView)) {
|
||||||
m_closeView = new CloseWindowView();
|
m_closeView = new CloseWindowView();
|
||||||
connect(m_closeView, &CloseWindowView::requestClose, this, &PresentWindowsEffect::closeWindow);
|
connect(m_closeView, &CloseWindowView::requestClose, this, &PresentWindowsEffect::closeWindow);
|
||||||
}
|
}
|
||||||
|
@ -1505,8 +1509,8 @@ void PresentWindowsEffect::setActive(bool active)
|
||||||
winData->visible = (w->isOnDesktop(desktop) || w->isOnAllDesktops()) &&
|
winData->visible = (w->isOnDesktop(desktop) || w->isOnAllDesktops()) &&
|
||||||
!w->isMinimized() && (w->isCurrentTab() || winData->visible);
|
!w->isMinimized() && (w->isCurrentTab() || winData->visible);
|
||||||
}
|
}
|
||||||
delete m_closeView;
|
if (m_closeView)
|
||||||
m_closeView = 0;
|
m_closeView->hide();
|
||||||
|
|
||||||
// Move all windows back to their original position
|
// Move all windows back to their original position
|
||||||
foreach (EffectWindow * w, m_motionManager.managedWindows())
|
foreach (EffectWindow * w, m_motionManager.managedWindows())
|
||||||
|
|
|
@ -2,5 +2,5 @@
|
||||||
ProvidersUrl=http://download.kde.org/ocs/providers.xml
|
ProvidersUrl=http://download.kde.org/ocs/providers.xml
|
||||||
Categories=KWin Effects
|
Categories=KWin Effects
|
||||||
StandardResource=tmp
|
StandardResource=tmp
|
||||||
InstallationCommand=plasmapkg -t kwineffect -i %f
|
InstallationCommand=plasmapkg2 -t kwineffect -i %f
|
||||||
UninstallCommand=plasmapkg -t kwineffect -r %f
|
UninstallCommand=plasmapkg2 -t kwineffect -r %f
|
||||||
|
|
|
@ -2,5 +2,5 @@
|
||||||
ProvidersUrl=http://download.kde.org/ocs/providers.xml
|
ProvidersUrl=http://download.kde.org/ocs/providers.xml
|
||||||
Categories=KWin Scripts
|
Categories=KWin Scripts
|
||||||
StandardResource=tmp
|
StandardResource=tmp
|
||||||
InstallationCommand=plasmapkg -t kwinscript -i %f
|
InstallationCommand=plasmapkg2 -t kwinscript -i %f
|
||||||
UninstallCommand=plasmapkg -t kwinscript -r %f
|
UninstallCommand=plasmapkg2 -t kwinscript -r %f
|
||||||
|
|
|
@ -2,5 +2,5 @@
|
||||||
ProvidersUrl=http://download.kde.org/ocs/providers.xml
|
ProvidersUrl=http://download.kde.org/ocs/providers.xml
|
||||||
Categories=KWin Switching Layouts
|
Categories=KWin Switching Layouts
|
||||||
StandardResource=tmp
|
StandardResource=tmp
|
||||||
InstallationCommand=plasmapkg -t windowswitcher -i %f
|
InstallationCommand=plasmapkg2 -t windowswitcher -i %f
|
||||||
UninstallCommand=plasmapkg -t windowswitcher -r %f
|
UninstallCommand=plasmapkg2 -t windowswitcher -r %f
|
||||||
|
|
Loading…
Reference in New Issue