~fginther/unity/100-scopes-search-tests

« back to all changes in this revision

Viewing changes to dash/CoverflowResultView.cpp

Committer: Nick Dedekind
Date: 2013-03-12 13:31:41 UTC
mfrom: (3008.2.200 trunk)
Revision ID: nicholas.dedekind@gmail.com-20130312133141-qrq3x3ighapfd36f

merged with trunk

files added:
UnityCore/GLibDBusServer.cpp

UnityCore/GLibDBusServer.h

UnityCore/GnomeSessionManager.cpp

UnityCore/GnomeSessionManager.h

UnityCore/GnomeSessionManagerImpl.h

UnityCore/SessionManager.h

debian/scopes-recommends-generator

launcher/TooltipManager.cpp

launcher/TooltipManager.h

resources/dialog_close.png

resources/dialog_close_highlight.png

resources/dialog_close_press.png

resources/hibernate.png

resources/hibernate_highlight.png

resources/lockscreen.png

resources/lockscreen_highlight.png

resources/logout.png

resources/logout_highlight.png

resources/restart.png

resources/restart_highlight.png

resources/shutdown.png

resources/shutdown_highlight.png

resources/suspend.png

resources/suspend_highlight.png

shutdown

shutdown/CMakeLists.txt

shutdown/SessionButton.cpp

shutdown/SessionButton.h

shutdown/SessionController.cpp

shutdown/SessionController.h

shutdown/SessionView.cpp

shutdown/SessionView.h

shutdown/StandaloneSession.cpp

shutdown/pch

shutdown/pch/shutdown_pch.hh

tests/autopilot/unity/tests/launcher/test_tooltips.py

tests/test_glib_dbus_object.cpp

tests/test_glib_dbus_server.cpp

tests/test_gnome_session_manager.cpp

tests/test_mock_session_manager.h

tests/test_panel_view.cpp

tests/test_session_button.cpp

tests/test_session_controller.cpp

tests/test_session_view.cpp

tests/test_tooltip_manager.cpp

tests/test_unity_window_style.cpp

tests/test_unity_window_view.cpp

files renamed:
tests/test_service_gdbus_wrapper.c => tests/test_service_gdbus_wrapper.cpp

tests/test_service_hud.c => tests/test_service_hud.cpp

tests/test_service_lens.c => tests/test_service_lens.cpp

tests/test_service_main.c => tests/test_service_main.cpp

tests/test_service_model.c => tests/test_service_model.cpp

tests/test_service_panel.c => tests/test_service_panel.cpp

files modified:
CMakeLists.txt

UnityCore/CMakeLists.txt

UnityCore/GLibDBusProxy.cpp

UnityCore/GLibDBusProxy.h

UnityCore/Variant.cpp

config.h.cmake

dash/CoverflowResultView.cpp

dash/DashController.cpp

dash/DashController.h

dash/DashView.cpp

dash/PreviewStateMachine.cpp

dash/previews/ActionButton.cpp

dash/previews/SocialPreviewContent.cpp

debian/changelog

debian/control

debian/rules

debian/watch

hud/HudController.cpp

hud/HudIcon.cpp

hud/HudView.cpp

launcher/AbstractLauncherIcon.h

launcher/ApplicationLauncherIcon.cpp

launcher/ApplicationLauncherIcon.h

launcher/BFBLauncherIcon.cpp

launcher/CMakeLists.txt

launcher/HudLauncherIcon.cpp

launcher/Launcher.cpp

launcher/Launcher.h

launcher/LauncherController.cpp

launcher/LauncherControllerPrivate.h

launcher/LauncherIcon.cpp

launcher/LauncherIcon.h

launcher/LauncherModel.cpp

launcher/MockLauncherIcon.h

launcher/StandaloneLauncher.cpp

launcher/SwitcherController.cpp

launcher/SwitcherController.h

launcher/SwitcherControllerImpl.h

launcher/SwitcherView.cpp

launcher/SwitcherView.h

launcher/XdndCollectionWindowImp.cpp

panel/PanelController.cpp

panel/PanelView.cpp

panel/PanelView.h

plugins/unityshell/CMakeLists.txt

plugins/unityshell/src/inputremover.cpp

plugins/unityshell/src/unity-util-accessible.cpp

plugins/unityshell/src/unitya11ytests.cpp

plugins/unityshell/src/unityshell.cpp

plugins/unityshell/src/unityshell.h

po/POTFILES.in

services/panel-service.c

shortcuts/CMakeLists.txt

shortcuts/ShortcutController.cpp

shortcuts/ShortcutHintPrivate.cpp

shortcuts/ShortcutView.cpp

shortcuts/ShortcutView.h

tests/CMakeLists.txt

tests/autopilot/unity/emulators/launcher.py

tests/autopilot/unity/tests/launcher/test_icon_behavior.py

tests/autopilot/unity/tests/test_dash.py

tests/autopilot/unity/tests/test_ibus.py

tests/autopilot/unity/tests/test_panel.py

tests/autopilot/unity/tests/test_search.py

tests/mock-application.h

tests/test_application_launcher_icon.cpp

tests/test_categories.cpp

tests/test_expo_launcher_icon.cpp

tests/test_filesystem_lenses.cpp

tests/test_gdbus_proxy.cpp

tests/test_glib_variant.cpp

tests/test_launcher.cpp

tests/test_launcher_controller.cpp

tests/test_lens.cpp

tests/test_main_dbus.cpp

tests/test_model.cpp

tests/test_model_iterator.cpp

tests/test_results.cpp

tests/test_service_gdbus_wrapper.h

tests/test_service_hud.h

tests/test_service_lens.h

tests/test_service_model.h

tests/test_service_panel.h

tests/test_software_center_launcher_icon.cpp

tests/test_thumbnail_generator.cpp

tests/test_utils.h

unity-shared/DashStyle.cpp

unity-shared/DebugDBusInterface.cpp

unity-shared/DebugDBusInterface.h

unity-shared/IconRenderer.cpp

unity-shared/IconTexture.cpp

unity-shared/IconTexture.h

unity-shared/LayoutSystem.cpp

unity-shared/MockableBaseWindow.h

unity-shared/StaticCairoText.cpp

unity-shared/UBusMessages.h

unity-shared/UnityWindowStyle.cpp

unity-shared/UnityWindowStyle.h

unity-shared/UnityWindowView.cpp

unity-shared/UnityWindowView.h

unity-shared/WindowButtons.cpp

Show diffs side-by-side

added added

removed removed

dash/CoverflowResultView.cpp

icon_texture_->SinkReference();

icon_texture_->LoadIcon();

icon_texture_->texture_updated.connect([&] (nux::BaseTexture *texture)

icon_texture_->texture_updated.connect([this] (nux::ObjectPtr<nux::BaseTexture> const&)

{

if (parent_)

parent_->NeedRedraw();

119

120

nux::ObjectPtr<nux::BaseTexture> CoverflowResultItem::GetTexture() const

121

{

122

return nux::ObjectPtr<nux::BaseTexture>(icon_texture_->texture());

122

return icon_texture_->texture();

123

}

124

125

void CoverflowResultItem::Activate(int button)

Older »