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
af8de280
Commit
af8de280
authored
Nov 18, 2019
by
Marcus Nordenberg
Committed by
Claes Sjöfors
Mar 03, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
xtt: Fix subwindow segfault when updating context
parent
fbc0a781
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
3 deletions
+12
-3
xtt/lib/glow/gtk/glow_draw_gtk.cpp
xtt/lib/glow/gtk/glow_draw_gtk.cpp
+5
-0
xtt/lib/glow/src/glow_growwindow.cpp
xtt/lib/glow/src/glow_growwindow.cpp
+6
-2
xtt/lib/glow/src/glow_growwindow.h
xtt/lib/glow/src/glow_growwindow.h
+1
-1
No files found.
xtt/lib/glow/gtk/glow_draw_gtk.cpp
View file @
af8de280
...
@@ -4156,9 +4156,14 @@ void GlowDrawGtk::pop_customcolors()
...
@@ -4156,9 +4156,14 @@ void GlowDrawGtk::pop_customcolors()
{
{
if
(
customcolors_cnt
<=
0
)
{
if
(
customcolors_cnt
<=
0
)
{
printf
(
"** Customcolor stack disorder
\n
"
);
printf
(
"** Customcolor stack disorder
\n
"
);
return
;
}
}
for
(
int
i
=
0
;
i
<
customcolors_cnt
-
1
;
i
++
)
for
(
int
i
=
0
;
i
<
customcolors_cnt
-
1
;
i
++
)
{
customcolors
[
i
]
=
customcolors
[
i
+
1
];
customcolors
[
i
]
=
customcolors
[
i
+
1
];
customcolors
[
i
+
1
]
=
NULL
;
}
customcolors_cnt
--
;
customcolors_cnt
--
;
}
}
...
...
xtt/lib/glow/src/glow_growwindow.cpp
View file @
af8de280
...
@@ -789,12 +789,13 @@ int GrowWindow::update_attributes()
...
@@ -789,12 +789,13 @@ int GrowWindow::update_attributes()
if
(
window_ctx
)
{
if
(
window_ctx
)
{
if
(
window_ctx
->
trace_started
)
if
(
window_ctx
->
trace_started
)
window_ctx
->
trace_close
();
window_ctx
->
trace_close
();
ctx
->
gdraw
->
pop_customcolors
();
delete
window_ctx
;
delete
window_ctx
;
fill_drawtype
=
original_fill_drawtype
=
glow_eDrawType_Inherit
;
fill_drawtype
=
original_fill_drawtype
=
glow_eDrawType_Inherit
;
fill
=
0
;
fill
=
0
;
}
}
strcpy
(
file_name
,
input_file_name
);
strcpy
(
file_name
,
input_file_name
);
new_ctx
();
new_ctx
(
true
);
sts
=
1
;
sts
=
1
;
ctx
->
gdraw
->
reset_clip_rectangle
(
&
ctx
->
mw
);
ctx
->
gdraw
->
reset_clip_rectangle
(
&
ctx
->
mw
);
...
@@ -923,7 +924,7 @@ void GrowWindow::h_value_changed_cb(void* o, double value)
...
@@ -923,7 +924,7 @@ void GrowWindow::h_value_changed_cb(void* o, double value)
gw
->
draw
();
gw
->
draw
();
}
}
void
GrowWindow
::
new_ctx
()
void
GrowWindow
::
new_ctx
(
bool
is_updating_attributes
)
{
{
char
fname
[
200
];
char
fname
[
200
];
int
sts
;
int
sts
;
...
@@ -976,6 +977,9 @@ void GrowWindow::new_ctx()
...
@@ -976,6 +977,9 @@ void GrowWindow::new_ctx()
if
(
!
copied
)
if
(
!
copied
)
strcpy
(
window_ctx
->
owner
,
owner
);
strcpy
(
window_ctx
->
owner
,
owner
);
window_ctx
->
customcolors
=
ctx
->
gdraw
->
create_customcolors
();
window_ctx
->
customcolors
=
ctx
->
gdraw
->
create_customcolors
();
if
(
is_updating_attributes
)
ctx
->
gdraw
->
push_customcolors
(
window_ctx
->
customcolors
);
if
(
!
no_file
)
{
if
(
!
no_file
)
{
window_ctx
->
set_nodraw
();
window_ctx
->
set_nodraw
();
...
...
xtt/lib/glow/src/glow_growwindow.h
View file @
af8de280
...
@@ -278,7 +278,7 @@ public:
...
@@ -278,7 +278,7 @@ public:
int
update_attributes
();
int
update_attributes
();
//! Create a new grow context
//! Create a new grow context
void
new_ctx
();
void
new_ctx
(
bool
is_updating_attributes
=
false
);
// Configure the scrollbars
// Configure the scrollbars
void
configure_scrollbars
();
void
configure_scrollbars
();
...
...
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