← Back to branch summary

~3v1n0/unity/overlay-border-scale

~3v1n0/unity/overlay-border-scale

« back to all changes in this revision

Viewing changes to plugins/unityshell/src/CairoTexture.h

Committer: Daniel van Vugt
Date: 2012-03-14 06:24:18 UTC
mfrom: (2108 unity)
mto: This revision was merged to the branch mainline in revision 2146.
Revision ID: daniel.van.vugt@canonical.com-20120314062418-nprucpbr0m7qky5e

Merged latest lp:unity

files added:
UnityCore/HomeLens.cpp

UnityCore/HomeLens.h

UnityCore/Hud.cpp

UnityCore/Hud.h

manual-tests/AutoMaximize.txt

manual-tests/DragDropDashLauncher.txt

manual-tests/Hud.txt

manual-tests/Lenses.txt

manual-tests/MMOptions.txt

manual-tests/Menus.txt

manual-tests/Switcher.txt

manual-tests/TEST_TEMPLATE.txt

manual-tests/lp929506.txt

plugins/unityshell/resources/close_dash_disabled.png

plugins/unityshell/resources/launcher_icon_shadow_200.png

plugins/unityshell/resources/launcher_icon_shadow_62.png

plugins/unityshell/resources/launcher_pressure_effect.png

plugins/unityshell/resources/maximize_dash_disabled.png

plugins/unityshell/resources/minimize_dash_disabled.png

plugins/unityshell/resources/search_circle.svg

plugins/unityshell/resources/search_close.svg

plugins/unityshell/resources/search_spin.svg

plugins/unityshell/resources/squircle_edge_54.png

plugins/unityshell/resources/squircle_glow_62.png

plugins/unityshell/resources/squircle_shadow_62.png

plugins/unityshell/resources/star_deselected.png

plugins/unityshell/resources/star_highlight.png

plugins/unityshell/resources/star_selected.png

plugins/unityshell/resources/unmaximize_dash_disabled.png

plugins/unityshell/src/AbstractLauncherIcon.cpp

plugins/unityshell/src/AbstractPlacesGroup.cpp

plugins/unityshell/src/AbstractPlacesGroup.h

plugins/unityshell/src/CairoBaseWindow.cpp

plugins/unityshell/src/CairoBaseWindow.h

plugins/unityshell/src/Decaymulator.cpp

plugins/unityshell/src/Decaymulator.h

plugins/unityshell/src/FavoriteStorePrivate.cpp

plugins/unityshell/src/FavoriteStorePrivate.h

plugins/unityshell/src/HudButton.cpp

plugins/unityshell/src/HudButton.h

plugins/unityshell/src/HudController.cpp

plugins/unityshell/src/HudController.h

plugins/unityshell/src/HudIcon.cpp

plugins/unityshell/src/HudIcon.h

plugins/unityshell/src/HudIconTextureSource.cpp

plugins/unityshell/src/HudIconTextureSource.h

plugins/unityshell/src/HudView.cpp

plugins/unityshell/src/HudView.h

plugins/unityshell/src/IconTextureSource.cpp

plugins/unityshell/src/IconTextureSource.h

plugins/unityshell/src/IntrospectableWrappers.cpp

plugins/unityshell/src/IntrospectableWrappers.h

plugins/unityshell/src/LauncherOptions.cpp

plugins/unityshell/src/LauncherOptions.h

plugins/unityshell/src/LensViewPrivate.cpp

plugins/unityshell/src/LensViewPrivate.h

plugins/unityshell/src/MultiMonitor.h

plugins/unityshell/src/PointerBarrier.cpp

plugins/unityshell/src/PointerBarrier.h

plugins/unityshell/src/UnityWindowStyle.cpp

plugins/unityshell/src/UnityWindowStyle.h

plugins/unityshell/src/UnityWindowView.cpp

plugins/unityshell/src/UnityWindowView.h

plugins/unityshell/src/UnityshellPrivate.cpp

plugins/unityshell/src/UnityshellPrivate.h

po/unity.pot

standalone-clients/StandaloneHud.cpp

standalone-clients/nux_automated_test_framework.cpp

standalone-clients/nux_automated_test_framework.h

standalone-clients/nux_test_framework.cpp

standalone-clients/nux_test_framework.h

standalone-clients/ui/TestTooltip.cpp

tests/autopilot/autopilot/emulators/bamf.py

tests/autopilot/autopilot/emulators/dbus_handler.py

tests/autopilot/autopilot/emulators/ibus.py

tests/autopilot/autopilot/emulators/unity

tests/autopilot/autopilot/emulators/unity/__init__.py

tests/autopilot/autopilot/emulators/unity/dash.py

tests/autopilot/autopilot/emulators/unity/hud.py

tests/autopilot/autopilot/emulators/unity/icons.py

tests/autopilot/autopilot/emulators/unity/launcher.py

tests/autopilot/autopilot/emulators/unity/quicklist.py

tests/autopilot/autopilot/emulators/unity/shortcut_hint.py

tests/autopilot/autopilot/emulators/unity/switcher.py

tests/autopilot/autopilot/emulators/unity/workspace.py

tests/autopilot/autopilot/keybindings.py

tests/autopilot/autopilot/tests/test_command_lens.py

tests/autopilot/autopilot/tests/test_hud.py

tests/autopilot/autopilot/tests/test_ibus.py

tests/autopilot/autopilot/tests/test_invisible_windows.py

tests/autopilot/autopilot/tests/test_quicklist.py

tests/autopilot/autopilot/tests/test_shortcut_hint.py

tests/autopilot/autopilot/tests/test_showdesktop.py

tests/autopilot/autopilot/tests/test_unity_logging.py

tests/autopilot/autopilot/utilities.py

tests/autopilot/tests

tests/autopilot/tests/README

tests/autopilot/tests/__init__.py

tests/autopilot/tests/test_compiz_key_translate.py

tests/test_favorite_store_private.cpp

tests/test_gdbus_proxy.cpp

tests/test_home_lens.cpp

tests/test_hud.cpp

tests/test_icon_loader.cpp

tests/test_launcher_model.cpp

tests/test_lensview_impl.cpp

tests/test_service_gdbus_wrapper.c

tests/test_service_gdbus_wrapper.h

tests/test_service_hud.c

tests/test_service_hud.h

tests/test_switcher_controller.cpp

tests/test_unityshell_private.cpp

tools/unity-introspection-visualiser.py

files removed:
manual-tests/Showdesktop.txt

plugins/unityshell/resources/search_close_glow.png

plugins/unityshell/resources/search_spin_glow.png

plugins/unityshell/resources/squircle_glow_54.png

plugins/unityshell/src/FilterWidget.cpp

plugins/unityshell/src/FilterWidget.h

plugins/unityshell/src/HomeView.cpp

plugins/unityshell/src/HomeView.h

plugins/unityshell/src/PlacesHomeView.cpp

plugins/unityshell/src/PlacesHomeView.h

po/unity.pot

tests/autopilot/autopilot/emulators/unity.py

tests/autopilot/bin

files renamed:
plugins/unityshell/src/DashSearchBar.cpp => plugins/unityshell/src/SearchBar.cpp

plugins/unityshell/src/DashSearchBar.h => plugins/unityshell/src/SearchBar.h

plugins/unityshell/src/DashSearchBarSpinner.cpp => plugins/unityshell/src/SearchBarSpinner.cpp

plugins/unityshell/src/DashSearchBarSpinner.h => plugins/unityshell/src/SearchBarSpinner.h

tests/unit/TestSwitcherModel.cpp => tests/test_switcher_model.cpp

tests/autopilot/bin/run_autopilot => tools/autopilot

files modified:
.bzrignore

AUTHORS

CMakeLists.txt

ChangeLog

HACKING

README

UnityCore/CMakeLists.txt

UnityCore/Categories.cpp

UnityCore/Categories.h

UnityCore/DBusIndicators.cpp

UnityCore/FilesystemLenses.cpp

UnityCore/FilesystemLenses.h

UnityCore/Filters.cpp

UnityCore/Filters.h

UnityCore/GLibDBusProxy.cpp

UnityCore/GLibDBusProxy.h

UnityCore/GLibWrapper.cpp

UnityCore/GLibWrapper.h

UnityCore/Lens.cpp

UnityCore/Lens.h

UnityCore/Model-inl.h

UnityCore/Model.h

UnityCore/Results.cpp

UnityCore/Results.h

UnityCore/Variant.cpp

UnityCore/Variant.h

com.canonical.Unity.gschema.xml

manual-tests/Dash.txt

manual-tests/Launcher.txt

manual-tests/SuperTab.txt

manual-tests/UserInvisibleWindows.txt

plugins/unity-mt-grab-handles/CMakeLists.txt

plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp

plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.h

plugins/unitydialog/src/unitydialog.cpp

plugins/unitydialog/src/unitydialog.h

plugins/unityshell/resources/close_dash.png

plugins/unityshell/resources/close_dash_prelight.png

plugins/unityshell/resources/close_dash_pressed.png

plugins/unityshell/resources/dash-widgets.json

plugins/unityshell/resources/launcher_arrow_ltr.png

plugins/unityshell/resources/launcher_arrow_outline_ltr.png

plugins/unityshell/resources/launcher_arrow_outline_rtl.png

plugins/unityshell/resources/launcher_arrow_rtl.png

plugins/unityshell/resources/launcher_bfb.png

plugins/unityshell/resources/launcher_icon_glow_200.png

plugins/unityshell/resources/launcher_pip_ltr.png

plugins/unityshell/resources/launcher_pip_rtl.png

plugins/unityshell/resources/maximize_dash.png

plugins/unityshell/resources/maximize_dash_prelight.png

plugins/unityshell/resources/maximize_dash_pressed.png

plugins/unityshell/resources/minimize_dash.png

plugins/unityshell/resources/minimize_dash_prelight.png

plugins/unityshell/resources/minimize_dash_pressed.png

plugins/unityshell/resources/search_close.png

plugins/unityshell/resources/search_magnify.png

plugins/unityshell/resources/search_spin.png

plugins/unityshell/resources/squircle_base_selected_54.png

plugins/unityshell/resources/squircle_shine_54.png

plugins/unityshell/resources/unmaximize_dash.png

plugins/unityshell/resources/unmaximize_dash_prelight.png

plugins/unityshell/resources/unmaximize_dash_pressed.png

plugins/unityshell/src/AbstractIconRenderer.h

plugins/unityshell/src/AbstractLauncherIcon.h

plugins/unityshell/src/AbstractShortcutHint.h

plugins/unityshell/src/AggregateMonitor.cpp

plugins/unityshell/src/BFBLauncherIcon.cpp

plugins/unityshell/src/BFBLauncherIcon.h

plugins/unityshell/src/BGHash.cpp

plugins/unityshell/src/BGHash.h

plugins/unityshell/src/BamfLauncherIcon.cpp

plugins/unityshell/src/BamfLauncherIcon.h

plugins/unityshell/src/CairoTexture.h

plugins/unityshell/src/DashController.cpp

plugins/unityshell/src/DashController.h

plugins/unityshell/src/DashSettings.cpp

plugins/unityshell/src/DashStyle.cpp

plugins/unityshell/src/DashStyle.h

plugins/unityshell/src/DashView.cpp

plugins/unityshell/src/DashView.h

plugins/unityshell/src/DebugDBusInterface.cpp

plugins/unityshell/src/DebugDBusInterface.h

plugins/unityshell/src/DesktopLauncherIcon.cpp

plugins/unityshell/src/DesktopLauncherIcon.h

plugins/unityshell/src/DeviceLauncherIcon.cpp

plugins/unityshell/src/DeviceLauncherIcon.h

plugins/unityshell/src/DeviceLauncherSection.cpp

plugins/unityshell/src/DeviceLauncherSection.h

plugins/unityshell/src/ElapsedTimeMonitor.cpp

plugins/unityshell/src/FavoriteStore.h

plugins/unityshell/src/FavoriteStoreGSettings.cpp

plugins/unityshell/src/FavoriteStoreGSettings.h

plugins/unityshell/src/FilterAllButton.cpp

plugins/unityshell/src/FilterAllButton.h

plugins/unityshell/src/FilterBar.cpp

plugins/unityshell/src/FilterBar.h

plugins/unityshell/src/FilterBasicButton.cpp

plugins/unityshell/src/FilterBasicButton.h

plugins/unityshell/src/FilterExpanderLabel.cpp

plugins/unityshell/src/FilterExpanderLabel.h

plugins/unityshell/src/FilterFactory.cpp

plugins/unityshell/src/FilterFactory.h

plugins/unityshell/src/FilterGenreButton.h

plugins/unityshell/src/FilterGenreWidget.cpp

plugins/unityshell/src/FilterGenreWidget.h

plugins/unityshell/src/FilterMultiRangeButton.cpp

plugins/unityshell/src/FilterMultiRangeButton.h

plugins/unityshell/src/FilterMultiRangeWidget.cpp

plugins/unityshell/src/FilterMultiRangeWidget.h

plugins/unityshell/src/FilterRatingsButton.cpp

plugins/unityshell/src/FilterRatingsButton.h

plugins/unityshell/src/FilterRatingsWidget.cpp

plugins/unityshell/src/FilterRatingsWidget.h

plugins/unityshell/src/GestureEngine.cpp

plugins/unityshell/src/IMTextEntry.cpp

plugins/unityshell/src/IMTextEntry.h

plugins/unityshell/src/IconLoader.cpp

plugins/unityshell/src/IconRenderer.cpp

plugins/unityshell/src/IconRenderer.h

plugins/unityshell/src/IconTexture.cpp

plugins/unityshell/src/IconTexture.h

plugins/unityshell/src/Introspectable.cpp

plugins/unityshell/src/Introspectable.h

plugins/unityshell/src/KeyboardUtil.h

plugins/unityshell/src/Launcher.cpp

plugins/unityshell/src/Launcher.h

plugins/unityshell/src/LauncherController.cpp

plugins/unityshell/src/LauncherController.h

plugins/unityshell/src/LauncherEntryRemote.h

plugins/unityshell/src/LauncherEntryRemoteModel.cpp

plugins/unityshell/src/LauncherHideMachine.cpp

plugins/unityshell/src/LauncherHideMachine.h

plugins/unityshell/src/LauncherIcon.cpp

plugins/unityshell/src/LauncherIcon.h

plugins/unityshell/src/LauncherModel.cpp

plugins/unityshell/src/LauncherModel.h

plugins/unityshell/src/LensBar.cpp

plugins/unityshell/src/LensBar.h

plugins/unityshell/src/LensBarIcon.cpp

plugins/unityshell/src/LensView.cpp

plugins/unityshell/src/LensView.h

plugins/unityshell/src/MockLauncherIcon.h

plugins/unityshell/src/MockShortcutHint.h

plugins/unityshell/src/OverlayRenderer.cpp

plugins/unityshell/src/OverlayRenderer.h

plugins/unityshell/src/PanelController.cpp

plugins/unityshell/src/PanelController.h

plugins/unityshell/src/PanelIndicatorEntryView.cpp

plugins/unityshell/src/PanelIndicatorEntryView.h

plugins/unityshell/src/PanelIndicatorsView.cpp

plugins/unityshell/src/PanelIndicatorsView.h

plugins/unityshell/src/PanelMenuView.cpp

plugins/unityshell/src/PanelStyle.cpp

plugins/unityshell/src/PanelStyle.h

plugins/unityshell/src/PanelTray.cpp

plugins/unityshell/src/PanelView.cpp

plugins/unityshell/src/PanelView.h

plugins/unityshell/src/PlacesGroup.cpp

plugins/unityshell/src/PlacesGroup.h

plugins/unityshell/src/PlacesSimpleTile.cpp

plugins/unityshell/src/PlacesSimpleTile.h

plugins/unityshell/src/PlacesTile.cpp

plugins/unityshell/src/PlacesTile.h

plugins/unityshell/src/PluginAdapter.cpp

plugins/unityshell/src/PluginAdapter.h

plugins/unityshell/src/PreviewBase.h

plugins/unityshell/src/PreviewBasicButton.h

plugins/unityshell/src/QuicklistManager.cpp

plugins/unityshell/src/QuicklistManager.h

plugins/unityshell/src/QuicklistMenuItem.cpp

plugins/unityshell/src/QuicklistMenuItem.h

plugins/unityshell/src/QuicklistMenuItemCheckmark.cpp

plugins/unityshell/src/QuicklistMenuItemCheckmark.h

plugins/unityshell/src/QuicklistMenuItemLabel.cpp

plugins/unityshell/src/QuicklistMenuItemLabel.h

plugins/unityshell/src/QuicklistMenuItemRadio.cpp

plugins/unityshell/src/QuicklistMenuItemRadio.h

plugins/unityshell/src/QuicklistMenuItemSeparator.cpp

plugins/unityshell/src/QuicklistMenuItemSeparator.h

plugins/unityshell/src/QuicklistView.cpp

plugins/unityshell/src/QuicklistView.h

plugins/unityshell/src/ResultRendererTile.cpp

plugins/unityshell/src/ResultView.cpp

plugins/unityshell/src/ResultView.h

plugins/unityshell/src/ResultViewGrid.cpp

plugins/unityshell/src/ResultViewGrid.h

plugins/unityshell/src/ScreenEffectFramebufferObject.cpp

plugins/unityshell/src/ScreenEffectFramebufferObject.h

plugins/unityshell/src/ShortcutController.cpp

plugins/unityshell/src/ShortcutController.h

plugins/unityshell/src/ShortcutHint.cpp

plugins/unityshell/src/ShortcutHintPrivate.cpp

plugins/unityshell/src/ShortcutHintPrivate.h

plugins/unityshell/src/ShortcutView.cpp

plugins/unityshell/src/ShortcutView.h

plugins/unityshell/src/SimpleLauncherIcon.cpp

plugins/unityshell/src/SimpleLauncherIcon.h

plugins/unityshell/src/SoftwareCenterLauncherIcon.cpp

plugins/unityshell/src/SoftwareCenterLauncherIcon.h

plugins/unityshell/src/SpacerLauncherIcon.cpp

plugins/unityshell/src/SpacerLauncherIcon.h

plugins/unityshell/src/StaticCairoText.cpp

plugins/unityshell/src/StaticCairoText.h

plugins/unityshell/src/SwitcherController.cpp

plugins/unityshell/src/SwitcherController.h

plugins/unityshell/src/SwitcherModel.cpp

plugins/unityshell/src/SwitcherModel.h

plugins/unityshell/src/SwitcherView.cpp

plugins/unityshell/src/SwitcherView.h

plugins/unityshell/src/TimeUtil.h

plugins/unityshell/src/Tooltip.cpp

plugins/unityshell/src/Tooltip.h

plugins/unityshell/src/TrashLauncherIcon.cpp

plugins/unityshell/src/TrashLauncherIcon.h

plugins/unityshell/src/UBusMessages.h

plugins/unityshell/src/UScreen.cpp

plugins/unityshell/src/UScreen.h

plugins/unityshell/src/WindowButtons.cpp

plugins/unityshell/src/WindowManager.cpp

plugins/unityshell/src/WindowManager.h

plugins/unityshell/src/XPathQueryPart.cpp

plugins/unityshell/src/XPathQueryPart.h

plugins/unityshell/src/compizminimizedwindowhandler.h

plugins/unityshell/src/comptransientfor.cpp

plugins/unityshell/src/nux-area-accessible.cpp

plugins/unityshell/src/transientfor.cpp

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

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

plugins/unityshell/src/unity-quicklist-menu-accessible.cpp

plugins/unityshell/src/unity-quicklist-menu-item-accessible.cpp

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

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

plugins/unityshell/src/unity-search-bar-accessible.cpp

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

plugins/unityshell/src/unitya11y.cpp

plugins/unityshell/src/unitya11ytests.cpp

plugins/unityshell/src/unityshell.cpp

plugins/unityshell/src/unityshell.h

plugins/unityshell/unityshell.xml.in

po/POTFILES.in

po/POTFILES.skip

services/CMakeLists.txt

services/panel-service.c

standalone-clients/CMakeLists.txt

standalone-clients/TestBGHash.cpp

standalone-clients/TestFilterBar.cpp

standalone-clients/TestFilters.cpp

standalone-clients/TestScreenEffectFramebufferObject.cpp

standalone-clients/TestShortcut.cpp

standalone-clients/standalone_dash.cpp

standalone-clients/ui/TestQuicklist.cpp

standalone-clients/ui/TestQuicklistVisuals.cpp

tests/CMakeLists.txt

tests/TestPlacesResults.cpp

tests/autopilot/Makefile

tests/autopilot/autopilot/emulators/X11.py

tests/autopilot/autopilot/glibrunner.py

tests/autopilot/autopilot/globals.py

tests/autopilot/autopilot/tests/__init__.py

tests/autopilot/autopilot/tests/test_dash.py

tests/autopilot/autopilot/tests/test_launcher.py

tests/autopilot/autopilot/tests/test_switcher.py

tests/autopilot/setup.py

tests/data/lenses/files/files.lens

tests/test_favorite_store_gsettings.cpp

tests/test_filesystem_lenses.cpp

tests/test_main_dbus.cpp

tests/test_service_main.c

tests/test_shortcut_model.cpp

tests/test_shortcut_private.cpp

tests/test_utils.h

tests/unit/TestQuicklistMenuitems.cpp

Show diffs side-by-side

added added

removed removed

plugins/unityshell/src/CairoTexture.h

23

23

#ifndef UNITY_CAIROTEXTURE_H

24

24

#define UNITY_CAIROTEXTURE_H

25

25

26

#include <Nux/Nux.h>

26

27

#include <NuxImage/CairoGraphics.h>

27

28

#include <NuxGraphics/NuxGraphics.h>

28

29

#include <NuxGraphics/GLTextureResourceManager.h>

Older »