Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
bc069814
Commit
bc069814
authored
Nov 14, 2004
by
Olivier Teulière
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* Merged trunk changeset 9319 to 0.8.1 branch.
parent
bfb0437b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
1 deletion
+11
-1
modules/gui/skins2/src/generic_window.hpp
modules/gui/skins2/src/generic_window.hpp
+3
-0
modules/gui/skins2/src/vout_window.hpp
modules/gui/skins2/src/vout_window.hpp
+2
-0
modules/gui/skins2/win32/win32_loop.cpp
modules/gui/skins2/win32/win32_loop.cpp
+6
-1
No files found.
modules/gui/skins2/src/generic_window.hpp
View file @
bc069814
...
...
@@ -76,6 +76,9 @@ class GenericWindow: public SkinObject, public Observer<VarBool>
/// Give access to the visibility variable
VarBool
&
getVisibleVar
()
{
return
m_varVisible
;
}
/// Window type, mainly useful when overloaded (for VoutWindow)
virtual
string
getType
()
const
{
return
"Generic"
;
}
protected:
/// Get the OS window
OSWindow
*
getOSWindow
()
const
{
return
m_pOsWindow
;
}
...
...
modules/gui/skins2/src/vout_window.hpp
View file @
bc069814
...
...
@@ -56,6 +56,8 @@ class VoutWindow: public GenericWindow
/// Refresh an area of the window
virtual
void
refresh
(
int
left
,
int
top
,
int
width
,
int
height
);
virtual
string
getType
()
const
{
return
"Vout"
;
}
private:
/// Image when there is no video
OSGraphics
*
m_pImage
;
...
...
modules/gui/skins2/win32/win32_loop.cpp
View file @
bc069814
...
...
@@ -129,7 +129,12 @@ void Win32Loop::run()
Infos
.
rcPaint
.
right
-
Infos
.
rcPaint
.
left
+
1
,
Infos
.
rcPaint
.
bottom
-
Infos
.
rcPaint
.
top
+
1
);
EndPaint
(
msg
.
hwnd
,
&
Infos
);
// Ignore all the painting events for the vout window,
// otherwise we are going to screw up the colorkey
if
(
win
.
getType
()
!=
"Vout"
)
{
win
.
processEvent
(
evt
);
}
break
;
}
case
WM_MOUSEMOVE
:
...
...
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