← Back to branch summary

~canonical-dx-team/unity/unity.fix-ql-losing-focus

~canonical-dx-team/unity/unity.fix-ql-losing-focus

« back to all changes in this revision

Viewing changes to src/SimpleLauncherIcon.cpp

Committer: Michael Terry
Date: 2010-12-17 14:07:11 UTC
mfrom: (724 unity)
mto: This revision was merged to the branch mainline in revision 743.
Revision ID: mike@mterry.name-20101217140711-qlij3bxdjuq1xoph

merge from upstream

files added:
plugin-unityshell.png

resources/progress_bar_fill.png

resources/progress_bar_trough.png

src/PanelMenuView.cpp

src/PanelMenuView.h

src/PlacesController.cpp

src/PlacesController.h

src/PlacesView.cpp

src/PlacesView.h

src/UBusMessages.h

src/WindowButtons.cpp

src/WindowButtons.h

src/WindowManager.cpp

src/WindowManager.h

tests/TestPlaces.cpp

files modified:
CMakeLists.txt

libunity/perf-logger-utility.h

libunity/ubus-server.c

po/unity.pot

services/panel-service.c

src/BamfLauncherIcon.cpp

src/BamfLauncherIcon.h

src/IndicatorObjectEntryProxy.h

src/IndicatorObjectEntryProxyRemote.cpp

src/IndicatorObjectFactory.h

src/IndicatorObjectFactoryRemote.cpp

src/IndicatorObjectFactoryRemote.h

src/Launcher.cpp

src/Launcher.h

src/LauncherController.cpp

src/LauncherController.h

src/LauncherDragWindow.cpp

src/LauncherDragWindow.h

src/LauncherIcon.cpp

src/LauncherIcon.h

src/PanelHomeButton.cpp

src/PanelIndicatorObjectEntryView.cpp

src/PanelIndicatorObjectEntryView.h

src/PanelIndicatorObjectView.cpp

src/PanelIndicatorObjectView.h

src/PanelView.cpp

src/PanelView.h

src/PluginAdapter.cpp

src/PluginAdapter.h

src/SimpleLauncherIcon.cpp

src/TrashLauncherIcon.cpp

src/unity.cpp

src/unity.h

tests/CMakeLists.txt

unityshell.xml.in

Show diffs side-by-side

added added

removed removed

src/SimpleLauncherIcon.cpp

22

22

23

23

#include "SimpleLauncherIcon.h"

24

24

#include "Launcher.h"

25

#include "PluginAdapter.h"

25

26

26

27

SimpleLauncherIcon::SimpleLauncherIcon (Launcher* IconManager)

27

28

: LauncherIcon(IconManager)

55

56

void

56

57

SimpleLauncherIcon::OnMouseClick (int button)

57

58

{

59

if (button == 1)

60

PluginAdapter::Default ()->TerminateScale ();

58

61

}

59

62

60

63

void

Older »