Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
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
videolan
vlc-gpu
Commits
2e5c6bd8
Commit
2e5c6bd8
authored
May 16, 2005
by
Gildas Bazin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* modules/gui/wxwindows/interface.cpp: another fix for the embedded video size.
parent
71954776
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
21 deletions
+16
-21
modules/gui/wxwindows/interface.cpp
modules/gui/wxwindows/interface.cpp
+16
-21
No files found.
modules/gui/wxwindows/interface.cpp
View file @
2e5c6bd8
...
@@ -692,27 +692,23 @@ void Interface::ShowSlider( bool show, bool layout )
...
@@ -692,27 +692,23 @@ void Interface::ShowSlider( bool show, bool layout )
//prevent continuous layout
//prevent continuous layout
if
(
slider_frame
->
IsShown
()
)
return
;
if
(
slider_frame
->
IsShown
()
)
return
;
slider_frame
->
Show
();
frame_sizer
->
Show
(
slider_frame
);
}
}
else
else
{
{
//prevent continuous layout
//prevent continuous layout
if
(
!
slider_frame
->
IsShown
()
)
return
;
if
(
!
slider_frame
->
IsShown
()
)
return
;
slider_frame
->
Hide
();
frame_sizer
->
Hide
(
slider_frame
);
}
}
if
(
layout
&&
p_intf
->
p_sys
->
b_video_autosize
)
UpdateVideoWindow
(
p_intf
,
video_window
);
slider_frame
->
Show
(
show
);
frame_sizer
->
Show
(
slider_frame
,
show
);
if
(
layout
)
if
(
layout
)
{
{
frame_sizer
->
Layout
();
frame_sizer
->
Layout
();
if
(
p_intf
->
p_sys
->
b_video_autosize
)
if
(
p_intf
->
p_sys
->
b_video_autosize
)
frame_sizer
->
Fit
(
this
);
{
UpdateVideoWindow
(
p_intf
,
video_window
);
frame_sizer
->
Fit
(
this
);
}
}
}
}
}
...
@@ -730,28 +726,25 @@ void Interface::ShowDiscFrame( bool show, bool layout )
...
@@ -730,28 +726,25 @@ void Interface::ShowDiscFrame( bool show, bool layout )
//prevent continuous layout
//prevent continuous layout
if
(
disc_frame
->
IsShown
()
)
return
;
if
(
disc_frame
->
IsShown
()
)
return
;
disc_frame
->
Show
();
slider_sizer
->
Show
(
disc_frame
);
}
}
else
else
{
{
//prevent continuous layout
//prevent continuous layout
if
(
!
disc_frame
->
IsShown
()
)
return
;
if
(
!
disc_frame
->
IsShown
()
)
return
;
disc_frame
->
Hide
();
slider_sizer
->
Hide
(
disc_frame
);
}
}
if
(
layout
&&
p_intf
->
p_sys
->
b_video_autosize
)
UpdateVideoWindow
(
p_intf
,
video_window
);
disc_frame
->
Show
(
show
);
slider_sizer
->
Show
(
disc_frame
,
show
);
if
(
layout
)
if
(
layout
)
{
{
slider_sizer
->
Layout
();
slider_sizer
->
Layout
();
if
(
p_intf
->
p_sys
->
b_video_autosize
)
if
(
p_intf
->
p_sys
->
b_video_autosize
)
{
UpdateVideoWindow
(
p_intf
,
video_window
);
slider_sizer
->
Fit
(
slider_frame
);
slider_sizer
->
Fit
(
slider_frame
);
}
}
}
}
}
/*****************************************************************************
/*****************************************************************************
...
@@ -759,6 +752,9 @@ void Interface::ShowDiscFrame( bool show, bool layout )
...
@@ -759,6 +752,9 @@ void Interface::ShowDiscFrame( bool show, bool layout )
*****************************************************************************/
*****************************************************************************/
void
Interface
::
OnControlsTimer
(
wxTimerEvent
&
WXUNUSED
(
event
)
)
void
Interface
::
OnControlsTimer
(
wxTimerEvent
&
WXUNUSED
(
event
)
)
{
{
if
(
p_intf
->
p_sys
->
b_video_autosize
)
UpdateVideoWindow
(
p_intf
,
video_window
);
/* Hide slider and Disc Buttons */
/* Hide slider and Disc Buttons */
//postpone layout, we'll do it ourselves
//postpone layout, we'll do it ourselves
HideDiscFrame
(
false
);
HideDiscFrame
(
false
);
...
@@ -768,7 +764,6 @@ void Interface::OnControlsTimer( wxTimerEvent& WXUNUSED(event) )
...
@@ -768,7 +764,6 @@ void Interface::OnControlsTimer( wxTimerEvent& WXUNUSED(event) )
if
(
p_intf
->
p_sys
->
b_video_autosize
)
if
(
p_intf
->
p_sys
->
b_video_autosize
)
{
{
slider_sizer
->
Fit
(
slider_frame
);
slider_sizer
->
Fit
(
slider_frame
);
UpdateVideoWindow
(
p_intf
,
video_window
);
frame_sizer
->
Fit
(
this
);
frame_sizer
->
Fit
(
this
);
}
}
}
}
...
...
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