Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
proview
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Esteban Blanc
proview
Commits
a6170a03
Commit
a6170a03
authored
Jun 10, 2019
by
Christoffer Ackelman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
QT: Fix highlight color.
parent
b1aaded1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
xtt/lib/flow/qt/flow_draw_qt.cqt
xtt/lib/flow/qt/flow_draw_qt.cqt
+1
-1
xtt/lib/glow/qt/glow_draw_qt.cqt
xtt/lib/glow/qt/glow_draw_qt.cqt
+6
-6
No files found.
xtt/lib/flow/qt/flow_draw_qt.cqt
View file @
a6170a03
...
@@ -857,7 +857,7 @@ void FlowDrawQt::arrow(int x1, int y1, int x2, int y2, int x3,
...
@@ -857,7 +857,7 @@ void FlowDrawQt::arrow(int x1, int y1, int x2, int y2, int x3,
painter_type = flow_eDrawType_Line;
painter_type = flow_eDrawType_Line;
}
}
get_painter(painter_type, idx);
get_painter(painter_type
+ highlight
, idx);
QPolygon poly(4);
QPolygon poly(4);
poly[0] = QPoint(x1, y1);
poly[0] = QPoint(x1, y1);
...
...
xtt/lib/glow/qt/glow_draw_qt.cqt
View file @
a6170a03
...
@@ -850,7 +850,7 @@ void GlowDrawQt::rect(int x, int y, int width, int height,
...
@@ -850,7 +850,7 @@ void GlowDrawQt::rect(int x, int y, int width, int height,
painter_type = glow_eDrawType_Line;
painter_type = glow_eDrawType_Line;
}
}
get_painter(painter_type, idx);
get_painter(painter_type
+ highlight
, idx);
if (fill) {
if (fill) {
painter.fillRect(x, y, width, height, painter.brush());
painter.fillRect(x, y, width, height, painter.brush());
} else {
} else {
...
@@ -873,7 +873,7 @@ void GlowDrawQt::arrow(int x1, int y1, int x2, int y2, int x3, int y3,
...
@@ -873,7 +873,7 @@ void GlowDrawQt::arrow(int x1, int y1, int x2, int y2, int x3, int y3,
poly[2] = QPoint(x3, y3);
poly[2] = QPoint(x3, y3);
poly[3] = QPoint(x1, y1);
poly[3] = QPoint(x1, y1);
get_painter(painter_type, idx);
get_painter(painter_type
+ highlight
, idx);
QPainterPath path;
QPainterPath path;
path.addPolygon(poly);
path.addPolygon(poly);
painter.fillPath(path, painter.brush());
painter.fillPath(path, painter.brush());
...
@@ -898,7 +898,7 @@ void GlowDrawQt::arc(int x, int y, int width, int height, int angle1,
...
@@ -898,7 +898,7 @@ void GlowDrawQt::arc(int x, int y, int width, int height, int angle1,
angle1 = angle1 + (-angle1 / 360 + 1) * 360;
angle1 = angle1 + (-angle1 / 360 + 1) * 360;
}
}
get_painter(painter_type, idx);
get_painter(painter_type
+ highlight
, idx);
if (fill) {
if (fill) {
painter.drawPie(x, y, width, height, angle1 * 16, angle2 * 16);
painter.drawPie(x, y, width, height, angle1 * 16, angle2 * 16);
} else {
} else {
...
@@ -921,7 +921,7 @@ void GlowDrawQt::line(int x1, int y1, int x2, int y2,
...
@@ -921,7 +921,7 @@ void GlowDrawQt::line(int x1, int y1, int x2, int y2,
painter_type = glow_eDrawType_Line;
painter_type = glow_eDrawType_Line;
}
}
get_painter(painter_type, idx);
get_painter(painter_type
+ highlight
, idx);
if (line_type != glow_eLineType_Solid) {
if (line_type != glow_eLineType_Solid) {
QPen pen = painter.pen();
QPen pen = painter.pen();
...
@@ -988,7 +988,7 @@ void GlowDrawQt::polyline(glow_sPointX* points, int point_cnt,
...
@@ -988,7 +988,7 @@ void GlowDrawQt::polyline(glow_sPointX* points, int point_cnt,
painter_type = glow_eDrawType_Line;
painter_type = glow_eDrawType_Line;
}
}
get_painter(painter_type, idx);
get_painter(painter_type
+ highlight
, idx);
if (fill) {
if (fill) {
unique_ptr<QPoint[]> qpoints = points_to_qt_points(points, point_cnt);
unique_ptr<QPoint[]> qpoints = points_to_qt_points(points, point_cnt);
painter.drawPolygon(qpoints.get(), point_cnt);
painter.drawPolygon(qpoints.get(), point_cnt);
...
@@ -1009,7 +1009,7 @@ void GlowDrawQt::text(int x, int y, char* text, int len,
...
@@ -1009,7 +1009,7 @@ void GlowDrawQt::text(int x, int y, char* text, int len,
font_idx = glow_eFont_Helvetica;
font_idx = glow_eFont_Helvetica;
}
}
get_painter(painter_type, idx);
get_painter(painter_type
+ highlight
, idx);
if (color != glow_eDrawType_Line) {
if (color != glow_eDrawType_Line) {
painter.setBrush(QBrush(draw_type_to_color(this, color, idx)));
painter.setBrush(QBrush(draw_type_to_color(this, color, idx)));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment