Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
8329973d
Commit
8329973d
authored
Feb 22, 2013
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Qt: Add moving main window on any part of a window"
This reverts commit
6b2d303b
. This fixes #8220.
parent
1f234ff6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
44 deletions
+0
-44
modules/gui/qt4/main_interface.cpp
modules/gui/qt4/main_interface.cpp
+0
-35
modules/gui/qt4/main_interface.hpp
modules/gui/qt4/main_interface.hpp
+0
-9
No files found.
modules/gui/qt4/main_interface.cpp
View file @
8329973d
...
@@ -327,11 +327,6 @@ void MainInterface::computeMinimumSize()
...
@@ -327,11 +327,6 @@ void MainInterface::computeMinimumSize()
setMinimumWidth
(
minWidth
);
setMinimumWidth
(
minWidth
);
}
}
inline
void
MainInterface
::
moveWindow
(
int
offsetX
,
int
offsetY
)
{
move
(
x
()
+
offsetX
,
y
()
+
offsetY
);
}
/*****************************
/*****************************
* Main UI handling *
* Main UI handling *
*****************************/
*****************************/
...
@@ -1411,36 +1406,6 @@ bool MainInterface::eventFilter( QObject *obj, QEvent *event )
...
@@ -1411,36 +1406,6 @@ bool MainInterface::eventFilter( QObject *obj, QEvent *event )
}
}
}
}
void
MainInterface
::
mousePressEvent
(
QMouseEvent
*
event
)
{
b_customMoving
=
Qt
::
LeftButton
==
event
->
button
();
lastCustomMovePos
=
event
->
globalPos
();
}
void
MainInterface
::
mouseMoveEvent
(
QMouseEvent
*
event
)
{
if
(
b_customMoving
)
{
moveWindow
(
event
->
globalX
()
-
lastCustomMovePos
.
x
(),
event
->
globalY
()
-
lastCustomMovePos
.
y
()
);
lastCustomMovePos
=
event
->
globalPos
();
}
}
void
MainInterface
::
mouseReleaseEvent
(
QMouseEvent
*
event
)
{
if
(
b_customMoving
)
{
moveWindow
(
event
->
globalX
()
-
lastCustomMovePos
.
x
(),
event
->
globalY
()
-
lastCustomMovePos
.
y
()
);
}
b_customMoving
=
false
;
}
void
MainInterface
::
toolBarConfUpdated
()
void
MainInterface
::
toolBarConfUpdated
()
{
{
QApplication
::
postEvent
(
this
,
new
QEvent
(
MainInterface
::
ToolbarsNeedRebuild
)
);
QApplication
::
postEvent
(
this
,
new
QEvent
(
MainInterface
::
ToolbarsNeedRebuild
)
);
...
...
modules/gui/qt4/main_interface.hpp
View file @
8329973d
...
@@ -105,9 +105,6 @@ protected:
...
@@ -105,9 +105,6 @@ protected:
virtual
void
keyPressEvent
(
QKeyEvent
*
);
virtual
void
keyPressEvent
(
QKeyEvent
*
);
virtual
void
wheelEvent
(
QWheelEvent
*
);
virtual
void
wheelEvent
(
QWheelEvent
*
);
virtual
bool
eventFilter
(
QObject
*
,
QEvent
*
);
virtual
bool
eventFilter
(
QObject
*
,
QEvent
*
);
virtual
void
mousePressEvent
(
QMouseEvent
*
);
virtual
void
mouseMoveEvent
(
QMouseEvent
*
);
virtual
void
mouseReleaseEvent
(
QMouseEvent
*
);
private:
private:
/* Main Widgets Creation */
/* Main Widgets Creation */
...
@@ -130,9 +127,6 @@ private:
...
@@ -130,9 +127,6 @@ private:
void
setInterfaceFullScreen
(
bool
);
void
setInterfaceFullScreen
(
bool
);
void
computeMinimumSize
();
void
computeMinimumSize
();
/* */
inline
void
moveWindow
(
int
offsetX
,
int
offsetY
);
/* */
/* */
QSettings
*
settings
;
QSettings
*
settings
;
QSystemTrayIcon
*
sysTray
;
QSystemTrayIcon
*
sysTray
;
...
@@ -161,8 +155,6 @@ private:
...
@@ -161,8 +155,6 @@ private:
QMap
<
QWidget
*
,
QSize
>
stackWidgetsSizes
;
QMap
<
QWidget
*
,
QSize
>
stackWidgetsSizes
;
QPoint
lastCustomMovePos
;
/* Flags */
/* Flags */
unsigned
i_notificationSetting
;
/// Systray Notifications
unsigned
i_notificationSetting
;
/// Systray Notifications
bool
b_autoresize
;
///< persistent resizable window
bool
b_autoresize
;
///< persistent resizable window
...
@@ -181,7 +173,6 @@ private:
...
@@ -181,7 +173,6 @@ private:
bool
b_hasPausedWhenMinimized
;
bool
b_hasPausedWhenMinimized
;
bool
b_statusbarVisible
;
bool
b_statusbarVisible
;
bool
b_customMoving
;
///< Is the window moving by dragging ?
#ifdef WIN32
#ifdef WIN32
HIMAGELIST
himl
;
HIMAGELIST
himl
;
...
...
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