← Back to branch summary

~azzar1/unity/hud-alt-space

~azzar1/unity/hud-alt-space

« back to all changes in this revision

Viewing changes to unity-shared/TextInput.h

Committer: handsome_feng
Date: 2016-03-18 01:18:38 UTC
mfrom: (4086 unity)
mto: (4067.4.18 MoveDashToBottom)
mto: This revision was merged to the branch mainline in revision 4089.
Revision ID: 445865575@qq.com-20160318011838-lk2zgbxpzlcs3his

merge trunk

files added:
unity-shared/GtkUtils.h

unity-shared/ThemeSettings.cpp

unity-shared/ThemeSettings.h

files modified:
UnityCore/DesktopUtilities.cpp

UnityCore/DesktopUtilities.h

dash/DashController.cpp

dash/DashController.h

dash/DashView.cpp

dash/DashView.h

dash/FilterBasicButton.cpp

dash/ResultRendererTile.cpp

dash/StandaloneDash.cpp

debian/changelog

debian/control

decorations/DecoratedWindow.cpp

decorations/DecorationsForceQuitDialog.cpp

decorations/DecorationsManager.cpp

decorations/DecorationsMenuDropdown.cpp

decorations/DecorationsMenuEntry.cpp

decorations/DecorationsPriv.h

launcher/BFBLauncherIcon.cpp

launcher/BFBLauncherIcon.h

launcher/ExpoLauncherIcon.h

launcher/LauncherController.cpp

launcher/LauncherIcon.cpp

launcher/LauncherIcon.h

launcher/QuicklistMenuItem.cpp

launcher/SimpleLauncherIcon.cpp

launcher/SimpleLauncherIcon.h

launcher/Volume.h

launcher/VolumeImp.cpp

launcher/VolumeImp.h

launcher/VolumeLauncherIcon.cpp

panel/PanelIndicatorEntryView.cpp

panel/PanelIndicatorEntryView.h

panel/PanelView.cpp

plugins/unityshell/src/inputremover.cpp

plugins/unityshell/src/inputremover.h

plugins/unityshell/src/unityshell.cpp

resources/dash-widgets.json

tests/autopilot/unity/tests/test_dash.py

tests/test_launcher_controller.cpp

tests/test_mock_devices.h

tests/test_volume_launcher_icon.cpp

unity-shared/CMakeLists.txt

unity-shared/CompizUtils.cpp

unity-shared/CompizUtils.h

unity-shared/DashStyle.cpp

unity-shared/DashStyle.h

unity-shared/DecorationStyle.cpp

unity-shared/DecorationStyle.h

unity-shared/FontSettings.cpp

unity-shared/FontSettings.h

unity-shared/IconLoader.cpp

unity-shared/IconRenderer.cpp

unity-shared/JSONParser.h

unity-shared/PanelStyle.cpp

unity-shared/PlacesOverlayVScrollBar.cpp

unity-shared/PlacesVScrollBar.cpp

unity-shared/PlacesVScrollBar.h

unity-shared/SearchBar.cpp

unity-shared/SearchBar.h

unity-shared/StaticCairoText.cpp

unity-shared/TextInput.cpp

unity-shared/TextInput.h

unity-shared/WindowButtons.cpp

unity-shared/WindowButtons.h

Show diffs side-by-side

added added

removed removed

unity-shared/TextInput.h

75

75

nux::Property<double> scale;

76

76

77

77

private:

78

void OnFontChanged();

78

void UpdateFont();

79

79

void UpdateHintFont();

80

80

void UpdateHintColor();

81

81

void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);

Older »