perso
/
finalcut
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* Bug fix in FDialog (use GlobalPos to move) 

* Don't check mouse click position on titlebar again while FDialog is in move
This commit is contained in:
Markus Gans 2015-08-08 23:40:32 +02:00
parent 5fd38b0496
commit b7a0dadd7b
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2015-08-08 Markus Gans <guru.mail@muenster.de>
* Bug fix in FDialog (use GlobalPos to move)
* Don't check mouse click position on titlebar again
while FDialog is in move
2015-07-26 Markus Gans <guru.mail@muenster.de> 2015-07-26 Markus Gans <guru.mail@muenster.de>
* init() method for the FStatusKey constructor * init() method for the FStatusKey constructor
to avoid code duplication to avoid code duplication

10
src/fdialog.cpp
View File

@ -504,15 +504,9 @@ void FDialog::onMouseUp (FMouseEvent* event)
//---------------------------------------------------------------------- //----------------------------------------------------------------------
void FDialog::onMouseMove (FMouseEvent* event) void FDialog::onMouseMove (FMouseEvent* event)
{ {
int titlebar_x = TitleBarClickPos.getX();
int titlebar_y = TitleBarClickPos.getY();
if ( event->getButton() == LeftButton ) if ( event->getButton() == LeftButton )
{ {
if ( ! TitleBarClickPos.isNull() if ( ! TitleBarClickPos.isNull() )
&& titlebar_x >= xpos+xmin+3
&& titlebar_x <= xpos+xmin-1+width
&& titlebar_y == ypos+ymin-1 )
{ {
FPoint currentPos(getGeometry().getX(), getGeometry().getY()); FPoint currentPos(getGeometry().getX(), getGeometry().getY());
FPoint deltaPos = event->getGlobalPos() - TitleBarClickPos; FPoint deltaPos = event->getGlobalPos() - TitleBarClickPos;
@ -693,7 +687,7 @@ void FDialog::move (int x, int y)
xpos = x; xpos = x;
ypos = y; ypos = y;
putArea (x, y, vwin); putArea (getGlobalPos(), vwin);
if ( getGeometry().overlap(oldGeometry) ) if ( getGeometry().overlap(oldGeometry) )
{ {