Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 19:29:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #7224 from ctrlaltdavid/20816

Browse source 
Change Running Scripts reload, close, and tree buttons when pressed
This commit is contained in:
Chris Collins 2016-03-01 10:26:58 -08:00
commit 926b93b4db
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/resources/qml/controls-uit/Table.qml
View file

@ -133,13 +133,14 @@ TableView {
HiFiGlyphs { HiFiGlyphs {
id: reloadButton id: reloadButton
text: hifi.glyphs.reloadSmall text: hifi.glyphs.reloadSmall
color: parent.color color: reloadButtonArea.pressed ? hifi.colors.white : parent.color
anchors { anchors {
top: parent.top top: parent.top
right: stopButton.left right: stopButton.left
verticalCenter: parent.verticalCenter verticalCenter: parent.verticalCenter
} }
MouseArea { MouseArea {
id: reloadButtonArea
anchors { fill: parent; margins: -2 } anchors { fill: parent; margins: -2 }
onClicked: reloadScript(model.url) onClicked: reloadScript(model.url)
} }
@ -149,13 +150,14 @@ TableView {
HiFiGlyphs { HiFiGlyphs {
id: stopButton id: stopButton
text: hifi.glyphs.closeSmall text: hifi.glyphs.closeSmall
color: parent.color color: stopButtonArea.pressed ? hifi.colors.white : parent.color
anchors { anchors {
top: parent.top top: parent.top
right: parent.right right: parent.right
verticalCenter: parent.verticalCenter verticalCenter: parent.verticalCenter
} }
MouseArea { MouseArea {
id: stopButtonArea
anchors { fill: parent; margins: -2 } anchors { fill: parent; margins: -2 }
onClicked: stopScript(model.url) onClicked: stopScript(model.url)
} }

15
interface/resources/qml/controls-uit/Tree.qml
View file

@ -56,14 +56,23 @@ TreeView {
branchDelegate: HiFiGlyphs { branchDelegate: HiFiGlyphs {
text: styleData.isExpanded ? hifi.glyphs.disclosureCollapse : hifi.glyphs.disclosureExpand text: styleData.isExpanded ? hifi.glyphs.disclosureCollapse : hifi.glyphs.disclosureExpand
size: hifi.fontSizes.tableText * 2.5 // tableText is in points; proportionately scale to pixels size: hifi.fontSizes.tableText * 2.5
color: colorScheme == hifi.colorSchemes.light color: colorScheme == hifi.colorSchemes.light
? (styleData.selected ? hifi.colors.black : hifi.colors.baseGrayHighlight) ? (styleData.selected
: (styleData.selected ? hifi.colors.black : hifi.colors.lightGrayText) ? hifi.colors.black
: (iconArea.pressed ? hifi.colors.white : hifi.colors.baseGrayHighlight))
: (styleData.selected
? hifi.colors.black
: (iconArea.pressed ? hifi.colors.white : hifi.colors.lightGrayText))
anchors { anchors {
left: parent ? parent.left : undefined left: parent ? parent.left : undefined
leftMargin: hifi.dimensions.tablePadding / 2 leftMargin: hifi.dimensions.tablePadding / 2
} }
MouseArea {
id: iconArea
anchors.fill: parent
propagateComposedEvents: true
}
} }
handle: Item { handle: Item {