Fixed color selection for map sketching #4274
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,30 @@ | ||||||
| import QtQuick | ||||||
|
|
||||||
| MMRoundButton { | ||||||
|
Collaborator
There was a problem hiding this comment. Is there any reason to base this from
Contributor
There was a problem hiding this comment. I guess I was the one creating the initial Component and it made more sense in the previous version to modify |
||||||
| id: root | ||||||
|
|
||||||
| required property color chosenColor | ||||||
|
Collaborator
There was a problem hiding this comment. If the button is chosen or not is defined by the
Suggested change
|
||||||
| property bool isSelected: false | ||||||
|
|
||||||
| anchors.verticalCenter: parent.verticalCenter | ||||||
|
|
||||||
| contentItem: Rectangle { | ||||||
| color: root.chosenColor | ||||||
| radius: width / 2 | ||||||
| anchors.fill: root | ||||||
| } | ||||||
|
|
||||||
| background: Rectangle { | ||||||
| anchors.centerIn: root | ||||||
|
|
||||||
| radius: width / 2 | ||||||
| width: __style.margin48 | ||||||
| height: __style.margin48 | ||||||
|
|
||||||
| color: root.isSelected ? __style.transparentColor : __style.lightGreenColor | ||||||
|
Collaborator
There was a problem hiding this comment. The
Contributor
There was a problem hiding this comment. Yes it creates this slightly visible halo around the button. Important for white and similar colors, which can blend with background. |
||||||
| border{ | ||||||
| width: 2 | ||||||
| color: root.isSelected ? __style.grassColor : __style.transparentColor | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| import QtQuick | ||
| import QtQuick.Controls | ||
|
|
||
| ScrollView { | ||
| id: root | ||
|
|
||
| required property list<color> colors | ||
| required property bool showEraseButton | ||
|
|
||
| property color activeColor | ||
| property bool eraserActive: false | ||
|
|
||
| height: scrollRow.height | ||
| ScrollBar.vertical.policy: ScrollBar.AlwaysOff | ||
| ScrollBar.horizontal.policy: ScrollBar.AlwaysOff | ||
|
|
||
| Row { | ||
| id: scrollRow | ||
| spacing: __style.margin12 | ||
| padding: __style.margin4 | ||
| anchors.centerIn: parent | ||
|
|
||
| Repeater { | ||
| model: root.colors | ||
| MMColorButton{ | ||
| required property color modelData | ||
| required property int index | ||
|
|
||
| chosenColor: modelData | ||
| isSelected: !root.eraserActive && (root.activeColor === modelData) | ||
|
|
||
| onClicked: { | ||
| if (root.showEraseButton) { | ||
| root.eraserActive = false; | ||
| } | ||
| root.activeColor = modelData; | ||
| } | ||
| Component.onCompleted: { | ||
| // set the initial color to be the first one in the list | ||
| if ( index === 0 ) | ||
| { | ||
| root.activeColor = modelData | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| MMButton { | ||
| text: qsTr("Eraser") | ||
| iconSourceLeft: __style.editIcon | ||
| // in some instances the erase button is not needed, because there is an "undo" feature already implemented | ||
| visible: root.showEraseButton | ||
|
|
||
| type: MMButton.Types.Primary | ||
| size: MMButton.Sizes.Small | ||
|
|
||
| fontColor: root.eraserActive ? __style.negativeColor : __style.grapeColor | ||
| iconColor: root.eraserActive ? __style.negativeColor : __style.grapeColor | ||
| bgndColor: root.eraserActive ? __style.grapeColor : __style.negativeColor | ||
| fontColorHover: root.eraserActive ? __style.grapeColor : __style.negativeColor | ||
| iconColorHover: root.eraserActive ? __style.grapeColor : __style.negativeColor | ||
| bgndColorHover: root.eraserActive ? __style.negativeColor : __style.grapeColor | ||
|
|
||
| onClicked: { | ||
| root.activeColor = null; | ||
| root.eraserActive = true; | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gabriel-bolbotina marked this conversation as resolved.
Show resolved
Hide resolved
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missing licence header
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also in other files