aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2020-07-08 19:07:21 +1000
committerNeil <nyamatongwe@gmail.com>2020-07-08 19:07:21 +1000
commit629eae1e428756f16ce486df78a8cab939438bde (patch)
tree2a4fda85bdd1769a458628660de8597cd57af23a
parent473cb1d9d394509f15131778b87673f8776bbcef (diff)
downloadscintilla-mirror-629eae1e428756f16ce486df78a8cab939438bde.tar.gz
Backport: Fix deprecated Qt call to use currently supported call.
Backport of changeset 8391:47cf3fcb2447.
-rw-r--r--qt/ScintillaEditBase/PlatQt.cpp2
-rw-r--r--qt/ScintillaEditBase/PlatQt.h4
2 files changed, 5 insertions, 1 deletions
diff --git a/qt/ScintillaEditBase/PlatQt.cpp b/qt/ScintillaEditBase/PlatQt.cpp
index 9f522e678..b56ae85e0 100644
--- a/qt/ScintillaEditBase/PlatQt.cpp
+++ b/qt/ScintillaEditBase/PlatQt.cpp
@@ -335,7 +335,7 @@ void SurfaceImpl::RoundedRectangle(PRectangle rc,
{
PenColour(fore);
BrushColour(back);
- GetPainter()->drawRoundRect(QRectFFromPRect(rc));
+ GetPainter()->drawRoundedRect(QRectFFromPRect(RectangleInset(rc, 0.5f)), 3.0f, 3.0f);
}
void SurfaceImpl::AlphaRectangle(PRectangle rc,
diff --git a/qt/ScintillaEditBase/PlatQt.h b/qt/ScintillaEditBase/PlatQt.h
index 0243de444..21e3ddda6 100644
--- a/qt/ScintillaEditBase/PlatQt.h
+++ b/qt/ScintillaEditBase/PlatQt.h
@@ -58,6 +58,10 @@ inline Point PointFromQPoint(QPoint qp)
return Point(qp.x(), qp.y());
}
+constexpr PRectangle RectangleInset(PRectangle rc, XYPOSITION delta) noexcept {
+ return PRectangle(rc.left + delta, rc.top + delta, rc.right - delta, rc.bottom - delta);
+}
+
class SurfaceImpl : public Surface {
private:
QPaintDevice *device;