~ubuntu-branches/ubuntu/trusty/gtk2-engines-oxygen/trusty-proposed

Viewing changes to src/oxygenwindowmanager.cpp

Committer: Package Import Robot
Author(s): Scarlett Clark
Date: 2014-02-12 06:35:44 UTC
mfrom: (1.3.2)
Revision ID: package-import@ubuntu.com-20140212063544-nnetktl56v0huubt

Tags: 1.4.3-0ubuntu1

https://launchpad.net/bugs/1219844

* New upstream release
* One major issue was fixed (basically some dangling
pointers being wrongly accessed). (LP: #1219844)

files added:
demo/oxygeninfowidget.cpp

demo/oxygeninfowidget.h

demo/oxygensignalhandler.cpp

demo/oxygensignalhandler.h

demo/oxygenversion.cpp

demo/oxygenversion.h

src/oxygendefines.h

files removed:
demo/oxygen_version.h

drag.patch

files modified:
.pc/dont-build-demos.patch/CMakeLists.txt

AUTHORS

CMakeLists.txt

config.h.cmake

debian/changelog

debian/patches/dont-build-demos.patch

demo/CMakeLists.txt

demo/oxygenbuttondemowidget.cpp

demo/oxygenbuttondemowidget.h

demo/oxygendemodialog.cpp

demo/oxygendemodialog.h

demo/oxygendemowidget.cpp

demo/oxygendemowidget.h

demo/oxygenframedemowidget.cpp

demo/oxygenframedemowidget.h

demo/oxygengtkdeco_main.cpp

demo/oxygengtkdemo_main.cpp

demo/oxygeninputdemowidget.cpp

demo/oxygeninputdemowidget.h

demo/oxygenlistdemowidget.cpp

demo/oxygenlistdemowidget.h

demo/oxygensignal.cpp

demo/oxygensignal.h

demo/oxygensliderdemowidget.cpp

demo/oxygensliderdemowidget.h

demo/oxygentabdemowidget.cpp

demo/oxygentabdemowidget.h

demo/oxygentimer.cpp

demo/oxygentimer.h

rc/argb-apps.conf

rc/gtkrc

src/animations/oxygenanimationengine.h

src/animations/oxygenanimations.cpp

src/animations/oxygenanimations.h

src/animations/oxygenarrowstatedata.cpp

src/animations/oxygenarrowstatedata.h

src/animations/oxygenarrowstateengine.h

src/animations/oxygenbackgroundhintengine.cpp

src/animations/oxygenbackgroundhintengine.h

src/animations/oxygenbaseengine.cpp

src/animations/oxygenbaseengine.h

src/animations/oxygencomboboxdata.cpp

src/animations/oxygencomboboxdata.h

src/animations/oxygencomboboxengine.h

src/animations/oxygencomboboxentrydata.cpp

src/animations/oxygencomboboxentrydata.h

src/animations/oxygencomboboxentryengine.h

src/animations/oxygencomboengine.h

src/animations/oxygendatamap.h

src/animations/oxygendialogengine.cpp

src/animations/oxygendialogengine.h

src/animations/oxygenflatwidgetengine.cpp

src/animations/oxygenflatwidgetengine.h

src/animations/oxygenfollowmousedata.cpp

src/animations/oxygenfollowmousedata.h

src/animations/oxygengenericengine.h

src/animations/oxygengroupboxengine.h

src/animations/oxygengroupboxlabeldata.h

src/animations/oxygengroupboxlabelengine.h

src/animations/oxygenhook.cpp

src/animations/oxygenhook.h

src/animations/oxygenhoverdata.cpp

src/animations/oxygenhoverdata.h

src/animations/oxygenhoverengine.h

src/animations/oxygeninnershadowdata.cpp

src/animations/oxygeninnershadowdata.h

src/animations/oxygeninnershadowengine.h

src/animations/oxygenmainwindowdata.cpp

src/animations/oxygenmainwindowdata.h

src/animations/oxygenmainwindowengine.h

src/animations/oxygenmenubarstatedata.cpp

src/animations/oxygenmenubarstatedata.h

src/animations/oxygenmenubarstateengine.h

src/animations/oxygenmenuitemdata.cpp

src/animations/oxygenmenuitemdata.h

src/animations/oxygenmenuitemengine.cpp

src/animations/oxygenmenuitemengine.h

src/animations/oxygenmenustatedata.cpp

src/animations/oxygenmenustatedata.h

src/animations/oxygenmenustateengine.h

src/animations/oxygenpaneddata.cpp

src/animations/oxygenpaneddata.h

src/animations/oxygenpanedengine.h

src/animations/oxygenscrollbardata.cpp

src/animations/oxygenscrollbardata.h

src/animations/oxygenscrollbarengine.h

src/animations/oxygenscrollbarstatedata.cpp

src/animations/oxygenscrollbarstatedata.h

src/animations/oxygenscrollbarstateengine.h

src/animations/oxygenscrolledwindowdata.cpp

src/animations/oxygenscrolledwindowdata.h

src/animations/oxygenscrolledwindowengine.h

src/animations/oxygensignal.cpp

src/animations/oxygensignal.h

src/animations/oxygentabwidgetdata.cpp

src/animations/oxygentabwidgetdata.h

src/animations/oxygentabwidgetengine.h

src/animations/oxygentabwidgetstatedata.cpp

src/animations/oxygentabwidgetstatedata.h

src/animations/oxygentabwidgetstateengine.h

src/animations/oxygentimeline.cpp

src/animations/oxygentimeline.h

src/animations/oxygentimelineserver.cpp

src/animations/oxygentimelineserver.h

src/animations/oxygentimer.cpp

src/animations/oxygentimer.h

src/animations/oxygentoolbarstatedata.cpp

src/animations/oxygentoolbarstatedata.h

src/animations/oxygentoolbarstateengine.h

src/animations/oxygentreeviewdata.cpp

src/animations/oxygentreeviewdata.h

src/animations/oxygentreeviewengine.cpp

src/animations/oxygentreeviewengine.h

src/animations/oxygentreeviewstatedata.cpp

src/animations/oxygentreeviewstatedata.h

src/animations/oxygentreeviewstateengine.h

src/animations/oxygenwidgetsizedata.cpp

src/animations/oxygenwidgetsizedata.h

src/animations/oxygenwidgetsizeengine.h

src/animations/oxygenwidgetstatedata.cpp

src/animations/oxygenwidgetstatedata.h

src/animations/oxygenwidgetstateengine.cpp

src/animations/oxygenwidgetstateengine.h

src/oxygen.h

src/oxygenanimationdata.h

src/oxygenanimationmodes.h

src/oxygenapplicationname.cpp

src/oxygenapplicationname.h

src/oxygenargbhelper.cpp

src/oxygenargbhelper.h

src/oxygencache.h

src/oxygencachekey.h

src/oxygencairocontext.cpp

src/oxygencairocontext.h

src/oxygencairopattern.h

src/oxygencairosurface.h

src/oxygencairosurfacecache.h

src/oxygencairoutils.cpp

src/oxygencairoutils.h

src/oxygencoloreffect.cpp

src/oxygencoloreffect.h

src/oxygencolorutils.cpp

src/oxygencolorutils.h

src/oxygenflags.h

src/oxygenfontinfo.cpp

src/oxygenfontinfo.h

src/oxygengeometry.h

src/oxygengtkcellinfo.cpp

src/oxygengtkcellinfo.h

src/oxygengtkdetails.h

src/oxygengtkgap.h

src/oxygengtkicons.cpp

src/oxygengtkicons.h

src/oxygengtkrc.cpp

src/oxygengtkrc.h

src/oxygengtktypenames.cpp

src/oxygengtktypenames.h

src/oxygengtkutils.cpp

src/oxygengtkutils.h

src/oxygenloghandler.cpp

src/oxygenloghandler.h

src/oxygenmetrics.h

src/oxygenobjectcounter.cpp

src/oxygenobjectcounter.h

src/oxygenobjectcountermap.cpp

src/oxygenobjectcountermap.h

src/oxygenoption.cpp

src/oxygenoption.h

src/oxygenoptionmap.cpp

src/oxygenoptionmap.h

src/oxygenpalette.cpp

src/oxygenpalette.h

src/oxygenpathlist.cpp

src/oxygenpathlist.h

src/oxygenpropertynames.cpp

src/oxygenpropertynames.h

src/oxygenqtsettings.cpp

src/oxygenqtsettings.h

src/oxygenrcstyle.cpp

src/oxygenrcstyle.h

src/oxygenrgba.cpp

src/oxygenrgba.h

src/oxygenshadowconfiguration.cpp

src/oxygenshadowconfiguration.h

src/oxygenshadowhelper.cpp

src/oxygenshadowhelper.h

src/oxygenstyle.cpp

src/oxygenstyle.h

src/oxygenstylehelper.cpp

src/oxygenstylehelper.h

src/oxygenstyleoptions.cpp

src/oxygenstyleoptions.h

src/oxygenstylewrapper.cpp

src/oxygenstylewrapper.h

src/oxygentaboptions.cpp

src/oxygentaboptions.h

src/oxygentheme.cpp

src/oxygentheme.h

src/oxygentileset.cpp

src/oxygentileset.h

src/oxygentilesetcache.h

src/oxygenwindecobutton.cpp

src/oxygenwindecobutton.h

src/oxygenwindecooptions.cpp

src/oxygenwindecooptions.h

src/oxygenwindowmanager.cpp

src/oxygenwindowmanager.h

src/oxygenwindowshadow.cpp

src/oxygenwindowshadow.h

src/oxygenxulinfo.h

Show diffs side-by-side

added added

removed removed

src/oxygenwindowmanager.cpp

* -------------------

* Largely inspired from Qtcurve style

508

{

509

510

if( _dragMode == Disabled ) return false;

511

else if( !_dragAboutToStart && withinWidget(widget, event ) && useEvent( widget, event ) )

511

else if( !_dragAboutToStart && checkCursor( event->window ) && withinWidget(widget, event ) && useEvent( widget, event ) )

512

{

513

514

// store widget and event position

537

}

538

539

//_________________________________________________

540

bool WindowManager::checkCursor( GdkWindow* window ) const

541

{

542

if( !window ) return true;

543

GdkCursor* cursor = gdk_window_get_cursor( window );

544

545

// do not propagate if widget's cursor is currently modified,

546

// since it is usually indicative of mouse action

547

return !cursor || gdk_cursor_get_cursor_type( cursor ) == GDK_ARROW;

548

549

}

550

551

//_________________________________________________

540

552

bool WindowManager::withinWidget( GtkWidget* widget, GdkEventButton* event ) const

541

553

{

542

554

664

676

if( !( event && withinWidget( childWidget, event ) ) )

665

677

{ continue; }

666

678

667

// do not propagate if widget's cursor is currently modified,

668

// since it is usually indicative of mouse action

669

GdkCursor* cursor = gdk_window_get_cursor( window );

670

if( cursor && gdk_cursor_get_cursor_type( cursor ) != GDK_ARROW )

671

{ usable = false; }

672

673

679

// check special cases for which grab should not be enabled

674

680

if( usable && (

675

681

widgetIsBlackListed( childWidget ) ||

Older »