[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [krita/krita-testing-wolthera] libs/ui/widgets: Fix offset for circular shape.
From:       Wolthera van Hovell tot Westerflier <griffinvalley () gmail ! com>
Date:       2016-08-26 16:40:57
Message-ID: E1bdKBd-0006IN-L7 () code ! kde ! org
[Download RAW message or body]

Git commit cdd0cd6a54876dbba5c102160e4bf523fec64b39 by Wolthera van Hovell tot \
Westerflier. Committed on 26/08/2016 at 13:15.
Pushed by woltherav into branch 'krita-testing-wolthera'.

Fix offset for circular shape.

M  +4    -4    libs/ui/widgets/kis_visual_color_selector.cpp

http://commits.kde.org/krita/cdd0cd6a54876dbba5c102160e4bf523fec64b39

diff --git a/libs/ui/widgets/kis_visual_color_selector.cpp \
b/libs/ui/widgets/kis_visual_color_selector.cpp index ab013b1..59be4de 100644
--- a/libs/ui/widgets/kis_visual_color_selector.cpp
+++ b/libs/ui/widgets/kis_visual_color_selector.cpp
@@ -1285,7 +1285,7 @@ QPointF \
KisVisualEllipticalSelectorShape::convertShapeCoordinateToWidgetCoordina  }
     line.setAngle(angle);
     if (getDimensions()!=KisVisualColorSelectorShape::onedimensional) {
-        line.setLength(coordinate.y()*a-offset);
+        line.setLength(qMin(coordinate.y()*(a-offset), a-offset));
     }
     x = qRound(line.p2().x());
     y = qRound(line.p2().y());
@@ -1300,7 +1300,7 @@ QPointF \
KisVisualEllipticalSelectorShape::convertWidgetCoordinateToShapeCoordina  qreal \
offset = 7.0;  QRect total(0, 0, width(), height());
     QLineF line(total.center(), coordinate);
-    qreal a = (total.width()/2)-offset;
+    qreal a = (total.width()/2);
     qreal angle;
 
     if (m_type!=KisVisualEllipticalSelectorShape::borderMirrored){
@@ -1309,7 +1309,7 @@ QPointF \
KisVisualEllipticalSelectorShape::convertWidgetCoordinateToShapeCoordina  angle = \
angle+180.0;  x = angle/360.0;
         if (getDimensions()==KisVisualColorSelectorShape::twodimensional) {
-            y = qBound(0.0,(line.length())/a, 1.0);
+            y = qBound(0.0,line.length()/(a-offset), 1.0);
         }
 
     } else {
@@ -1320,7 +1320,7 @@ QPointF \
KisVisualEllipticalSelectorShape::convertWidgetCoordinateToShapeCoordina  }
         x = (angle/360.0)*2;
         if (getDimensions()==KisVisualColorSelectorShape::twodimensional) {
-            y = qBound(0.0,(line.length())/a, 1.0);
+            y = qBound(0.0,(line.length()+offset)/a, 1.0);
         }
     }
 


[prev in list] [next in list] [prev in thread] [next in thread]