yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'KDE/4.11'

Browse source 
* KDE/4.11:
  Remove assertion in KDecorationUnstable's constructor.
  SVN_SILENT made messages (.desktop file)
  Cursor Theme KCM: Show correct resize cursor in preview for themes without a file called "size_fdiag"
  Fixed missing signal/slot connection:
  Fix zoom effect cursor position on initial zoom in.
  SVN_SILENT made messages (.desktop file)
  Don't show borders for a maximized Laptop client
  Always use PositionCenter for maximized windows
  Fix click on trash plasmoid when on desktop and widgets are unlocked

Conflicts:
	kwin/clients/aurorae/src/aurorae.cpp
	kwin/libkdecorations/kdecoration.cpp
	plasma/desktop/applets/trash/trash.cpp
	plasma/desktop/toolboxes/plasma-toolbox-desktoptoolbox.desktop
	plasma/desktop/toolboxes/plasma-toolbox-paneltoolbox.desktop
	plasma/generic/wallpapers/color/plasma-wallpaper-color.desktop
	plasma/generic/wallpapers/image/plasma-wallpaper-image.desktop
This commit is contained in:
Raphael Kubo da Costa 2013-10-20 17:42:39 +03:00
commit 54b08b9d9e
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
clients/aurorae/src/aurorae.cpp
View file

@ -363,7 +363,7 @@ KDecorationDefines::Position AuroraeClient::mousePosition(const QPoint &point) c
{
// based on the code from deKorator
int pos = PositionCenter;
if (isShade()) {
if (isShade() || isMaximized()) {
return Position(pos);
}
@ -371,9 +371,8 @@ KDecorationDefines::Position AuroraeClient::mousePosition(const QPoint &point) c
borders(borderLeft, borderRight, borderTop, borderBottom);
int paddingLeft, paddingTop, paddingRight, paddingBottom;
padding(paddingLeft, paddingRight, paddingTop, paddingBottom);
const bool maximized = maximizeMode() == MaximizeFull;
int titleEdgeLeft, titleEdgeRight, titleEdgeTop, titleEdgeBottom;
AuroraeFactory::instance()->theme()->titleEdges(titleEdgeLeft, titleEdgeTop, titleEdgeRight, titleEdgeBottom, maximized);
AuroraeFactory::instance()->theme()->titleEdges(titleEdgeLeft, titleEdgeTop, titleEdgeRight, titleEdgeBottom, false);
switch (AuroraeFactory::instance()->theme()->decorationPosition()) {
case DecorationTop:
borderTop = titleEdgeTop;

6
clients/laptop/laptopclient.cpp
View file

@ -410,13 +410,13 @@ int LaptopClient::layoutMetric(LayoutMetric lm, bool respectWindowState, const K
case LM_TitleEdgeRight:
case LM_BorderLeft:
case LM_BorderRight:
return 4;
return (maximizeMode() & MaximizeHorizontal) ? 0 : 4;
case LM_BorderBottom:
return mustDrawHandle() ? handleSize : 4;
return (maximizeMode() & MaximizeVertical) ? 0 : (isResizable() ? handleSize : 4);
case LM_TitleEdgeTop:
return 3;
return (maximizeMode() & MaximizeVertical) ? 0 : 3;
case LM_TitleEdgeBottom:
return 1;

3
effects/zoom/zoom.cpp
View file

@ -407,8 +407,9 @@ void ZoomEffect::zoomIn(double to)
polling = true;
effects->startMousePolling();
}
cursorPoint = effects->cursorPos();
if (mouseTracking == MouseTrackingDisabled)
prevPoint = effects->cursorPos();
prevPoint = cursorPoint;
effects->addRepaintFull();
}