diff options
| author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2018-04-09 10:59:00 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2018-04-09 12:05:07 +0300 |
| commit | e555aaf2c98dd7ebafe5b7c0651acc9ba09a7aef (patch) | |
| tree | 5a6fc38a5a2cafffba27921ee095b7b59a09c80f /src/Authoring/Studio/Palettes/controls | |
| parent | dcac485e410d0d8234359de2d5513ab3159dfb22 (diff) | |
| parent | 7be3f631b8b7cae3d1296ca03abd2fb730ab4c47 (diff) | |
Merge branch 'master' into wip/timeline
This merge loses datainput functionality in timeline toolbar.
It needs to be readded in a separate commit.
Change-Id: I92ca36e87718e9451b589465eb7ebbd801932820
Diffstat (limited to 'src/Authoring/Studio/Palettes/controls')
3 files changed, 13 insertions, 1 deletions
diff --git a/src/Authoring/Studio/Palettes/controls/FloatTextField.qml b/src/Authoring/Studio/Palettes/controls/FloatTextField.qml index db0b3347..c920cbdb 100644 --- a/src/Authoring/Studio/Palettes/controls/FloatTextField.qml +++ b/src/Authoring/Studio/Palettes/controls/FloatTextField.qml @@ -61,6 +61,7 @@ TextField { id: validator decimals: 3 locale: "C" + notation: DoubleValidator.StandardNotation } selectionColor: _selectionColor diff --git a/src/Authoring/Studio/Palettes/controls/StyledToolButton.qml b/src/Authoring/Studio/Palettes/controls/StyledToolButton.qml index fa775579..eb6d9749 100644 --- a/src/Authoring/Studio/Palettes/controls/StyledToolButton.qml +++ b/src/Authoring/Studio/Palettes/controls/StyledToolButton.qml @@ -41,7 +41,7 @@ ToolButton { StyledTooltip { id: toolTip - visible: control.hovered + enabled: control.hovered } background: Rectangle { diff --git a/src/Authoring/Studio/Palettes/controls/StyledTooltip.qml b/src/Authoring/Studio/Palettes/controls/StyledTooltip.qml index 3b29992a..001d8835 100644 --- a/src/Authoring/Studio/Palettes/controls/StyledTooltip.qml +++ b/src/Authoring/Studio/Palettes/controls/StyledTooltip.qml @@ -36,6 +36,17 @@ ToolTip { text: control.text } + // Handle tooltip visibility based on the trigger event given to the 'enabled' property and + // the 'Tooltips' view menu setting. Has to be done this way, as even though the eventFilter + // set for MainFrm catches the tooltip events for QML, it doesn't prevent showing them because + // we were/are controlling the visibility in code. + onEnabledChanged: { + if (enabled && _parentView.toolTipsEnabled()) + visible = true; + else + visible = false; + } + background: Rectangle { border.color: _studioColor3 color: _studioColor2 |