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
5b7b930e
Commit
5b7b930e
authored
Mar 19, 2010
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: fix main_interface sizing part 2
Close #3408 (blocker) Close #3245 (blocker)
parent
a88ba452
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
33 deletions
+20
-33
modules/gui/qt4/components/interface_widgets.cpp
modules/gui/qt4/components/interface_widgets.cpp
+2
-11
modules/gui/qt4/components/interface_widgets.hpp
modules/gui/qt4/components/interface_widgets.hpp
+2
-5
modules/gui/qt4/main_interface.cpp
modules/gui/qt4/main_interface.cpp
+10
-16
modules/gui/qt4/main_interface.hpp
modules/gui/qt4/main_interface.hpp
+6
-1
No files found.
modules/gui/qt4/components/interface_widgets.cpp
View file @
5b7b930e
...
...
@@ -176,11 +176,9 @@ void VideoWidget::SetSizing( unsigned int w, unsigned int h )
{
if
(
reparentable
->
windowState
()
&
Qt
::
WindowFullScreen
)
return
;
msg_Dbg
(
p_intf
,
"Video is resizing to: %i %i"
,
w
,
h
);
videoSize
.
setWidth
(
w
);
videoSize
.
setHeight
(
h
);
if
(
!
isVisible
()
)
show
();
updateGeometry
();
// Needed for deinterlace
resize
(
w
,
h
);
emit
sizeChanged
(
w
,
h
);
videoSync
();
}
...
...
@@ -266,17 +264,10 @@ void VideoWidget::release( void )
delete
reparentable
;
reparentable
=
NULL
;
videoSize
=
QSize
();
updateGeometry
();
hide
();
}
QSize
VideoWidget
::
sizeHint
()
const
{
return
videoSize
;
}
/**********************************************************************
* Background Widget. Show a simple image background. Currently,
* it's album art if present or cone.
...
...
modules/gui/qt4/components/interface_widgets.hpp
View file @
5b7b930e
...
...
@@ -58,13 +58,10 @@ public:
VideoWidget
(
intf_thread_t
*
);
virtual
~
VideoWidget
();
WId
request
(
int
*
,
int
*
,
unsigned
int
*
,
unsigned
int
*
,
bool
);
WId
request
(
int
*
,
int
*
,
unsigned
int
*
,
unsigned
int
*
,
bool
);
void
release
(
void
);
int
control
(
void
*
,
int
,
va_list
);
virtual
QSize
sizeHint
()
const
;
protected:
virtual
QPaintEngine
*
paintEngine
()
const
{
...
...
@@ -74,12 +71,12 @@ protected:
private:
intf_thread_t
*
p_intf
;
QSize
videoSize
;
QWidget
*
reparentable
;
QLayout
*
layout
;
signals:
void
keyPressed
(
QKeyEvent
*
);
void
sizeChanged
(
int
,
int
);
public
slots
:
void
SetSizing
(
unsigned
int
,
unsigned
int
);
...
...
modules/gui/qt4/main_interface.cpp
View file @
5b7b930e
...
...
@@ -61,7 +61,7 @@
#include <vlc_keys.h>
/* Wheel event */
#include <vlc_vout_display.h>
/* vout_thread_t and VOUT_ events */
//
#define DEBUG_INTF
#define DEBUG_INTF
/* Callback prototypes */
static
int
PopupMenuCB
(
vlc_object_t
*
p_this
,
const
char
*
psz_variable
,
...
...
@@ -218,6 +218,8 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
{
CONNECT
(
this
,
askVideoToResize
(
unsigned
int
,
unsigned
int
),
videoWidget
,
SetSizing
(
unsigned
int
,
unsigned
int
)
);
CONNECT
(
videoWidget
,
sizeChanged
(
int
,
int
),
this
,
resizeStack
(
int
,
int
)
);
CONNECT
(
this
,
askVideoSetFullScreen
(
bool
),
videoWidget
,
SetFullScreen
(
bool
)
);
CONNECT
(
videoWidget
,
keyPressed
(
QKeyEvent
*
),
...
...
@@ -560,6 +562,7 @@ QSize MainInterface::sizeHint() const
*/
void
MainInterface
::
doComponentsUpdate
()
{
#if 0
if( isFullScreen() || isMaximized() ) return;
// msg_Warn( p_intf, "Updating the geometry" );
...
...
@@ -574,6 +577,7 @@ void MainInterface::doComponentsUpdate()
//resize( sizeHint() );
//adjustSize() ; /* This is not needed, but might help in the future */
#endif
}
void
MainInterface
::
debug
()
...
...
@@ -589,16 +593,12 @@ void MainInterface::debug()
msg_Dbg
(
p_intf
,
"size: %i - %i"
,
size
().
height
(),
size
().
width
()
);
msg_Dbg
(
p_intf
,
"sizeHint: %i - %i"
,
sizeHint
().
height
(),
sizeHint
().
width
()
);
//msg_Dbg( p_intf, "maximumsize: %i - %i", maximumSize().height(), maximumSize().width() );
msg_Dbg
(
p_intf
,
"maximumsize: %i - %i"
,
maximumSize
().
height
(),
maximumSize
().
width
()
);
msg_Dbg
(
p_intf
,
"minimumsize: %i - %i"
,
minimumSize
().
height
(),
minimumSize
().
width
()
);
msg_Dbg
(
p_intf
,
"Stack size: %i - %i"
,
stackCentralW
->
size
().
height
(),
stackCentralW
->
size
().
width
()
);
msg_Dbg
(
p_intf
,
"Stack minimumSize(): %i - %i"
,
stackCentralW
->
minimumHeight
(),
stackCentralW
->
minimumWidth
()
);
msg_Dbg
(
p_intf
,
"Central minimumsize: %i - %i"
,
centralWidget
()
->
minimumSize
().
height
(),
centralWidget
()
->
minimumSize
().
width
()
);
msg_Dbg
(
p_intf
,
"Stack sizeHint: %i - %i"
,
stackCentralW
->
sizeHint
().
height
(),
stackCentralW
->
sizeHint
().
width
()
);
msg_Dbg
(
p_intf
,
"Central size: %i - %i"
,
centralWidget
()
->
size
().
height
(),
centralWidget
()
->
size
().
width
()
);
msg_Dbg
(
p_intf
,
"Menu minimumsize: %i - %i"
,
menuBar
()
->
minimumSize
().
height
(),
menuBar
()
->
minimumSize
().
width
()
);
msg_Dbg
(
p_intf
,
"Input size: %i - %i"
,
inputC
->
size
().
height
(),
inputC
->
size
().
width
()
);
msg_Dbg
(
p_intf
,
"Status minimumsize: %i - %i"
,
statusBar
()
->
minimumSize
().
height
(),
statusBar
()
->
minimumSize
().
width
()
);
msg_Dbg
(
p_intf
,
"minimumsize: %i - %i"
,
minimumSize
().
height
(),
minimumSize
().
width
()
);
msg_Dbg
(
p_intf
,
"bg Size: %i - %i"
,
bgWidget
->
size
().
height
(),
bgWidget
->
size
().
width
()
);
/*if( videoWidget && videoWidget->isVisible() )
...
...
@@ -717,10 +717,6 @@ void MainInterface::getVideoSlot( WId *p_id, int *pi_x, int *pi_y,
/* Consider the video active now */
showVideo
();
stackCentralW
->
resize
(
*
pi_width
,
*
pi_height
);
emit
askUpdate
();
}
}
...
...
@@ -749,8 +745,6 @@ void MainInterface::releaseVideoSlot( void )
/* Asynchronous call from WindowControl function */
int
MainInterface
::
controlVideo
(
int
i_query
,
va_list
args
)
{
/* Debug to check if VOUT_WINDOW_SET_SIZE is called, because this is broken now */
msg_Warn
(
p_intf
,
"Control Video: %i"
,
i_query
);
switch
(
i_query
)
{
case
VOUT_WINDOW_SET_SIZE
:
...
...
@@ -758,8 +752,7 @@ int MainInterface::controlVideo( int i_query, va_list args )
unsigned
int
i_width
=
va_arg
(
args
,
unsigned
int
);
unsigned
int
i_height
=
va_arg
(
args
,
unsigned
int
);
emit
askVideoToResize
(
i_width
,
i_height
);
emit
askUpdate
();
return
VLC_EGENERIC
;
return
VLC_SUCCESS
;
}
case
VOUT_WINDOW_SET_STATE
:
{
...
...
@@ -1283,6 +1276,7 @@ void MainInterface::toggleFullScreen( void )
{
showNormal
();
emit
askUpdate
();
// Needed if video was launched after the F11
//FIXMe
emit
fullscreenInterfaceToggled
(
false
);
}
else
...
...
modules/gui/qt4/main_interface.hpp
View file @
5b7b930e
...
...
@@ -34,6 +34,7 @@
#endif
#include <QSystemTrayIcon>
#include <QStackedWidget>
class
QSettings
;
class
QCloseEvent
;
...
...
@@ -53,7 +54,6 @@ class SpeedControlWidget;
class
QVBoxLayout
;
class
QMenu
;
class
QSize
;
class
QStackedWidget
;
enum
{
CONTROLS_VISIBLE
=
0x1
,
...
...
@@ -211,6 +211,11 @@ private slots:
void
showBuffering
(
float
);
void
resizeStack
(
int
w
,
int
h
)
{
resize
(
size
()
-
stackCentralW
->
size
()
+
QSize
(
w
,
h
)
);
debug
();
}
signals:
void
askGetVideo
(
WId
*
p_id
,
int
*
pi_x
,
int
*
pi_y
,
unsigned
*
pi_width
,
unsigned
*
pi_height
);
...
...
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