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

« back to all changes in this revision

Viewing changes to src/animations/oxygenflatwidgetengine.cpp

Committer: Package Import Robot
Author(s): Felix Geyer
Date: 2012-05-06 11:57:43 UTC
mfrom: (1.1.17)
Revision ID: package-import@ubuntu.com-20120506115743-mzhcx54u2vs984rn

Tags: 1.2.3-0ubuntu1

https://launchpad.net/bugs/992133

* New upstream release.
- Fixes crash in Filezilla. (LP: #992133)

files added:
src/animations/oxygenmenuitemdata.cpp

src/animations/oxygenmenuitemdata.h

src/animations/oxygenmenuitemengine.h

files removed:
src/oxygendbus.cpp

src/oxygendbus.h

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

CMakeLists.txt

debian/changelog

rc/gtkrc

src/CMakeLists.txt

src/animations/oxygenanimations.cpp

src/animations/oxygenanimations.h

src/animations/oxygenflatwidgetengine.cpp

src/animations/oxygenflatwidgetengine.h

src/animations/oxygeninnershadowdata.cpp

src/animations/oxygeninnershadowdata.h

src/animations/oxygensignal.h

src/animations/oxygentoolbarstatedata.cpp

src/animations/oxygentoolbarstatedata.h

src/animations/oxygentoolbarstateengine.h

src/oxygenargbhelper.cpp

src/oxygenargbhelper.h

src/oxygengtkicons.cpp

src/oxygengtktypenames.cpp

src/oxygengtktypenames.h

src/oxygenqtsettings.cpp

src/oxygenqtsettings.h

src/oxygenstyle.cpp

src/oxygenstyle.h

src/oxygenstylewrapper.cpp

src/oxygentheme.cpp

src/oxygenwindecobutton.cpp

src/oxygenwindowmanager.cpp

Show diffs side-by-side

added added

removed removed

src/animations/oxygenflatwidgetengine.cpp

namespace Oxygen

{

//_________________________________________________________

bool FlatWidgetEngine::registerWidget( GtkWidget* widget )

{

if( contains( widget ) ) return false;

_data.insert( widget );

bool FlatWidgetEngine::registerFlatWidget( GtkWidget* widget )

{

if( containsFlat( widget ) ) return false;

_flatData.insert( widget );

BaseEngine::registerWidget( widget );

return true;

}

//_________________________________________________________

bool FlatWidgetEngine::registerPaintWidget( GtkWidget* widget )

{

if( containsPaint( widget ) ) return false;

_paintData.insert( widget );

BaseEngine::registerWidget( widget );

return true;

}

{

for( GtkWidget* parent = widget; parent; parent = gtk_widget_get_parent( parent ) )

{ if( contains( parent ) ) return parent; }

{

if( containsPaint( parent ) ) return 0x0;

else if( containsFlat( parent ) ) return parent;

}

return 0L;

}

Older »