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
e728b990
Commit
e728b990
authored
Oct 27, 2014
by
Claes Sjofors
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ge line drawing bugfix
parent
a5a1b576
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
4 deletions
+25
-4
src/mmi/co/src/proview_icon17.png
src/mmi/co/src/proview_icon17.png
+0
-0
xtt/lib/glow/gtk/glow_draw_gtk.cpp
xtt/lib/glow/gtk/glow_draw_gtk.cpp
+25
-4
No files found.
src/mmi/co/src/proview_icon17.png
0 → 100644
View file @
e728b990
1.05 KB
xtt/lib/glow/gtk/glow_draw_gtk.cpp
View file @
e728b990
...
...
@@ -1419,6 +1419,13 @@ int GlowDrawGtk::arc_erase( GlowWind *wind, int x, int y, int width, int height,
if
(
ctx
->
nodraw
)
return
1
;
DrawWindGtk
*
w
=
(
DrawWindGtk
*
)
wind
->
window
;
if
(
w
->
clip_on
&&
!
(
w
->
clip_rectangle
[
w
->
clip_cnt
-
1
].
x
<=
x
+
width
&&
w
->
clip_rectangle
[
w
->
clip_cnt
-
1
].
x
+
w
->
clip_rectangle
[
w
->
clip_cnt
-
1
].
width
>=
x
&&
w
->
clip_rectangle
[
w
->
clip_cnt
-
1
].
y
<=
y
+
height
&&
w
->
clip_rectangle
[
w
->
clip_cnt
-
1
].
y
+
w
->
clip_rectangle
[
w
->
clip_cnt
-
1
].
height
>=
y
))
return
1
;
// if ( width < 35 && height < 35) {width++; height++;} // This looks good in Reflexion X ...
if
(
angle1
>=
360
)
...
...
@@ -1450,10 +1457,10 @@ int GlowDrawGtk::line( GlowWind *wind, int x1, int y1, int x2, int y2,
DrawWindGtk
*
w
=
(
DrawWindGtk
*
)
wind
->
window
;
if
(
w
->
clip_on
&&
!
(
w
->
clip_rectangle
[
w
->
clip_cnt
-
1
].
x
<=
x2
&&
w
->
clip_rectangle
[
w
->
clip_cnt
-
1
].
x
+
w
->
clip_rectangle
[
w
->
clip_cnt
-
1
].
width
>=
x1
&&
w
->
clip_rectangle
[
w
->
clip_cnt
-
1
].
y
<=
y2
&&
w
->
clip_rectangle
[
w
->
clip_cnt
-
1
].
y
+
w
->
clip_rectangle
[
w
->
clip_cnt
-
1
].
height
>=
y1
))
!
(
w
->
clip_rectangle
[
w
->
clip_cnt
-
1
].
x
<=
max
(
x1
,
x2
)
&&
w
->
clip_rectangle
[
w
->
clip_cnt
-
1
].
x
+
w
->
clip_rectangle
[
w
->
clip_cnt
-
1
].
width
>=
min
(
x1
,
x2
)
&&
w
->
clip_rectangle
[
w
->
clip_cnt
-
1
].
y
<=
max
(
y1
,
y2
)
&&
w
->
clip_rectangle
[
w
->
clip_cnt
-
1
].
y
+
w
->
clip_rectangle
[
w
->
clip_cnt
-
1
].
height
>=
min
(
y1
,
y2
)
))
return
1
;
// Fix for highlight for connections in grow
...
...
@@ -1486,6 +1493,13 @@ int GlowDrawGtk::line_dashed( GlowWind *wind, int x1, int y1, int x2, int y2,
if
(
ctx
->
nodraw
)
return
1
;
DrawWindGtk
*
w
=
(
DrawWindGtk
*
)
wind
->
window
;
if
(
w
->
clip_on
&&
!
(
w
->
clip_rectangle
[
w
->
clip_cnt
-
1
].
x
<=
max
(
x1
,
x2
)
&&
w
->
clip_rectangle
[
w
->
clip_cnt
-
1
].
x
+
w
->
clip_rectangle
[
w
->
clip_cnt
-
1
].
width
>=
min
(
x1
,
x2
)
&&
w
->
clip_rectangle
[
w
->
clip_cnt
-
1
].
y
<=
max
(
y1
,
y2
)
&&
w
->
clip_rectangle
[
w
->
clip_cnt
-
1
].
y
+
w
->
clip_rectangle
[
w
->
clip_cnt
-
1
].
height
>=
min
(
y1
,
y2
)))
return
1
;
// Fix for highlight for connections in grow
if
(
highlight
&&
ctx
->
type
()
==
glow_eCtxType_Grow
)
gc_type
=
glow_eDrawType_LineHighlight
;
...
...
@@ -1561,6 +1575,13 @@ int GlowDrawGtk::line_erase( GlowWind *wind, int x1, int y1, int x2, int y2,
if
(
ctx
->
nodraw
)
return
1
;
DrawWindGtk
*
w
=
(
DrawWindGtk
*
)
wind
->
window
;
if
(
w
->
clip_on
&&
!
(
w
->
clip_rectangle
[
w
->
clip_cnt
-
1
].
x
<=
max
(
x1
,
x2
)
&&
w
->
clip_rectangle
[
w
->
clip_cnt
-
1
].
x
+
w
->
clip_rectangle
[
w
->
clip_cnt
-
1
].
width
>=
min
(
x1
,
x2
)
&&
w
->
clip_rectangle
[
w
->
clip_cnt
-
1
].
y
<=
max
(
y1
,
y2
)
&&
w
->
clip_rectangle
[
w
->
clip_cnt
-
1
].
y
+
w
->
clip_rectangle
[
w
->
clip_cnt
-
1
].
height
>=
min
(
y1
,
y2
)))
return
1
;
if
(
w
->
clip_on
)
set_clip
(
w
,
get_gc
(
this
,
glow_eDrawType_LineErase
,
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