Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Synchronet
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Main
Synchronet
Commits
22b033a0
Commit
22b033a0
authored
17 years ago
by
deuce
Browse files
Options
Downloads
Patches
Plain Diff
Stop resizeing and moving the window... for real this time.
parent
179b85c8
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/syncterm/htmlwin.cpp
+20
-15
20 additions, 15 deletions
src/syncterm/htmlwin.cpp
src/syncterm/term.c
+1
-1
1 addition, 1 deletion
src/syncterm/term.c
with
21 additions
and
16 deletions
src/syncterm/htmlwin.cpp
+
20
−
15
View file @
22b033a0
...
...
@@ -67,6 +67,7 @@ protected:
void
MyHTML
::
OnKeyDown
(
wxKeyEvent
&
event
);
void
MyHTML
::
OnUpdate
(
wxCommandEvent
&
event
);
void
MyHTML
::
OnState
(
wxCommandEvent
&
event
);
void
MyHTML
::
UnHide
(
void
);
DECLARE_EVENT_TABLE
()
};
...
...
@@ -137,20 +138,11 @@ void MyHTML::OnKeyDown(wxKeyEvent& event)
void
MyHTML
::
OnUpdate
(
wxCommandEvent
&
event
)
{
int
width
,
height
,
xpos
,
ypos
;
pthread_mutex_lock
(
&
update_mutex
);
switch
(
update_type
)
{
case
HTML_WIN_UPDATE_REPLACE
:
frame
->
Show
();
frame
->
Raise
();
frame
->
GetPosition
(
&
xpos
,
&
ypos
);
frame
->
GetSize
(
&
width
,
&
height
);
if
(
xpos
!=
window_xpos
||
ypos
!=
window_ypos
||
width
!=
window_width
||
height
!=
window_height
)
frame
->
SetSize
(
window_xpos
,
window_ypos
,
window_width
,
window_height
,
wxSIZE_AUTO
);
htmlWindow
->
SetPage
(
update_str
);
htmlWindow
->
Raise
();
htmlWindow
->
SetFocus
();
...
...
@@ -166,13 +158,28 @@ void MyHTML::OnUpdate(wxCommandEvent &event)
pthread_mutex_unlock
(
&
update_mutex
);
}
void
MyHTML
::
UnHide
(
void
)
{
int
width
,
height
,
xpos
,
ypos
;
if
(
!
frame
->
IsShown
())
{
frame
->
GetPosition
(
&
xpos
,
&
ypos
);
frame
->
GetSize
(
&
width
,
&
height
);
if
(
xpos
!=
window_xpos
||
ypos
!=
window_ypos
||
width
!=
window_width
||
height
!=
window_height
)
frame
->
SetSize
(
window_xpos
,
window_ypos
,
window_width
,
window_height
,
wxSIZE_AUTO
);
frame
->
Show
(
true
);
}
}
void
MyHTML
::
OnState
(
wxCommandEvent
&
event
)
{
if
(
wxTheApp
)
{
switch
(
html_window_requested_state
)
{
case
HTML_WIN_STATE_RAISED
:
if
(
!
frame
->
IsShown
())
frame
->
Show
();
UnHide
();
if
(
frame
->
IsIconized
())
frame
->
Iconize
(
false
);
frame
->
Raise
();
...
...
@@ -180,15 +187,13 @@ void MyHTML::OnState(wxCommandEvent &event)
htmlWindow
->
SetFocus
();
break
;
case
HTML_WIN_STATE_LOWERED
:
if
(
!
frame
->
IsShown
())
frame
->
Show
();
UnHide
();
if
(
frame
->
IsIconized
())
frame
->
Iconize
(
false
);
frame
->
Lower
();
break
;
case
HTML_WIN_STATE_ICONIZED
:
if
(
!
frame
->
IsShown
())
frame
->
Show
();
UnHide
();
frame
->
Lower
();
if
(
!
frame
->
IsIconized
())
frame
->
Iconize
(
true
);
...
...
This diff is collapsed.
Click to expand it.
src/syncterm/term.c
+
1
−
1
View file @
22b033a0
...
...
@@ -1294,7 +1294,7 @@ BOOL doterm(struct bbslist *bbs)
html_startx
=
wherex
();
html_starty
=
wherey
();
html_commit
();
raise_html
()
raise_html
()
;
html_mode
=
HTML_MODE_RAISED
;
}
else
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment