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

Change the visual appearance of the composited outline 

Uses widgets/translucentbackground as FrameSvg item to ensure that we
don't get a huge black square on the screen.

When bordering a screen edge we disable the border except if all edges
are bordered. This makes a little bit more clear in the quick tiling case
what will be the geometry.

REVIEW: 110176
icc-effect-5.14.5
Martin Gräßlin 2013-04-25 09:40:13 +02:00
parent 1276eb044f
commit cc5d553d65
2 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
geometry.cpp
View File

@ -2631,6 +2631,7 @@ void Client::finishMoveResize(bool cancel)
setQuickTileMode(electricMode);
electricMaximizing = false;
outline()->hide();
elevate(false);
} else if (!cancel) {
if (!(maximizeMode() & MaximizeHorizontal)) {
geom_restore.setX(geometry().x());
@ -3092,6 +3093,7 @@ void Client::setElectricBorderMaximizing(bool maximizing)
outline()->show(electricBorderMaximizeGeometry(cursorPos(), desktop()));
else
outline()->hide();
elevate(maximizing);
}
QRect Client::electricBorderMaximizeGeometry(QPoint pos, int desktop)

38
outline.cpp
View File

@ -24,6 +24,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "composite.h"
// KWin libs
#include <kwinxrenderutils.h>
#include "workspace.h"
// Plasma
#include <Plasma/FrameSvg>
// Qt
@ -120,8 +121,7 @@ CompositedOutlineVisual::CompositedOutlineVisual(Outline *outline)
QPalette pal = palette();
pal.setColor(backgroundRole(), Qt::transparent);
setPalette(pal);
m_background->setImagePath("widgets/viewitem");
m_background->setElementPrefix("hover");
m_background->setImagePath("widgets/translucentbackground");
m_background->setCacheAllRenderedFrames(true);
m_background->setEnabledBorders(Plasma::FrameSvg::AllBorders);
}
@ -140,6 +140,40 @@ void CompositedOutlineVisual::show()
const QRect &outlineGeometry = outline()->geometry();
m_background->resizeFrame(outlineGeometry.size());
setGeometry(outlineGeometry);
// check which borders to enable
bool left, right, top, bottom;
left = right = top = bottom = false;
const QRect maximizedArea = Workspace::self()->clientArea(MaximizeArea, outlineGeometry.center(), 1);
if (outlineGeometry.x() == maximizedArea.x()) {
left = true;
}
if (outlineGeometry.y() == maximizedArea.y()) {
top = true;
}
if (outlineGeometry.right() == maximizedArea.right()) {
right = true;
}
if (outlineGeometry.bottom() == maximizedArea.bottom()) {
bottom = true;
}
Plasma::FrameSvg::EnabledBorders borders = Plasma::FrameSvg::AllBorders;
if (left) {
borders = borders & ~Plasma::FrameSvg::LeftBorder;
}
if (right) {
borders = borders & ~Plasma::FrameSvg::RightBorder;
}
if (top) {
borders = borders & ~Plasma::FrameSvg::TopBorder;
}
if (bottom) {
borders = borders & ~Plasma::FrameSvg::BottomBorder;
}
if (left && right && bottom && top) {
borders = Plasma::FrameSvg::AllBorders;
}
m_background->setEnabledBorders(borders);
QWidget::show();
}