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
cf4cc9a8
Commit
cf4cc9a8
authored
Mar 19, 2010
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: remove ugly hack for popupMenu
parent
5e27dcb8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
11 deletions
+6
-11
modules/gui/qt4/main_interface.cpp
modules/gui/qt4/main_interface.cpp
+6
-11
No files found.
modules/gui/qt4/main_interface.cpp
View file @
cf4cc9a8
...
...
@@ -229,11 +229,6 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
CONNECT
(
this
,
askUpdate
(),
this
,
doComponentsUpdate
()
);
CONNECT
(
THEDP
,
toolBarConfUpdated
(),
this
,
recreateToolbars
()
);
/* Enable the popup menu in the MI */
setContextMenuPolicy
(
Qt
::
CustomContextMenu
);
CONNECT
(
this
,
customContextMenuRequested
(
const
QPoint
&
),
this
,
popupMenu
(
const
QPoint
&
)
);
/** END of CONNECTS**/
...
...
@@ -404,6 +399,11 @@ void MainInterface::createMainWidget( QSettings *settings )
getSettings
()
->
endGroup
();
/* Enable the popup menu in the MI */
main
->
setContextMenuPolicy
(
Qt
::
CustomContextMenu
);
CONNECT
(
main
,
customContextMenuRequested
(
const
QPoint
&
),
this
,
popupMenu
(
const
QPoint
&
)
);
if
(
depth
()
>
8
)
/* 8bit depth has too many issues with opacity */
/* Create the FULLSCREEN CONTROLS Widget */
if
(
var_InheritBool
(
p_intf
,
"qt-fs-controller"
)
)
...
...
@@ -554,12 +554,7 @@ void MainInterface::destroyPopupMenu()
void
MainInterface
::
popupMenu
(
const
QPoint
&
p
)
{
/* FIXME
* Ow, that's ugly: don't show the popup menu if cursor over
* the main menu bar or the status bar */
if
(
!
childAt
(
p
)
||
(
(
childAt
(
p
)
!=
menuBar
()
)
&&
(
childAt
(
p
)
->
parentWidget
()
!=
statusBar
()
)
)
)
QVLCMenu
::
PopupMenu
(
p_intf
,
true
);
QVLCMenu
::
PopupMenu
(
p_intf
,
true
);
}
void
MainInterface
::
toggleFSC
()
...
...
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