feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Get rid of macros by using std functions

Browse Source 
Change-Id: Ie342b781b912dabbc890777db87793b5953dbe18
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Eike Ziller
2018-09-18 18:41:37 +02:00
parent 57af3f1f3d
commit 048f27633d
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/texteditor/texteditoroverlay.cpp
View File

@@ -32,6 +32,8 @@
#include <QPainter> #include <QPainter>
#include <QTextBlock> #include <QTextBlock>
#include <algorithm>
using namespace TextEditor; using namespace TextEditor;
using namespace TextEditor::Internal; using namespace TextEditor::Internal;
@@ -250,10 +252,10 @@ QPainterPath TextEditorOverlay::createSelectionPath(const QTextCursor &begin, co
const int count = selection.count(); const int count = selection.count();
for (int i = 1; i < count-1; ++i) { for (int i = 1; i < count-1; ++i) {
#define MAX3(a,b,c) qMax(a, qMax(b,c)) qreal x = std::max({selection.at(i - 1).right(),
qreal x = MAX3(selection.at(i-1).right(), selection.at(i).right(),
selection.at(i).right(), selection.at(i + 1).right()})
selection.at(i+1).right()) + margin; + margin;
points += QPointF(x+1, selection.at(i).top()); points += QPointF(x+1, selection.at(i).top());
points += QPointF(x+1, selection.at(i).bottom()); points += QPointF(x+1, selection.at(i).bottom());
@@ -266,10 +268,10 @@ QPainterPath TextEditorOverlay::createSelectionPath(const QTextCursor &begin, co
points += lastSelection.topLeft() + QPointF(-margin, 0); points += lastSelection.topLeft() + QPointF(-margin, 0);
for (int i = count-2; i > 0; --i) { for (int i = count-2; i > 0; --i) {
#define MIN3(a,b,c) qMin(a, qMin(b,c)) qreal x = std::min({selection.at(i - 1).left(),
qreal x = MIN3(selection.at(i-1).left(), selection.at(i).left(),
selection.at(i).left(), selection.at(i + 1).left()})
selection.at(i+1).left()) - margin; - margin;
points += QPointF(x, selection.at(i).bottom()+extra); points += QPointF(x, selection.at(i).bottom()+extra);
points += QPointF(x, selection.at(i).top()); points += QPointF(x, selection.at(i).top());