monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-12-24 20:49:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #912

Browse source 
aac7fc6 make privay level slider smoother
This commit is contained in:
luigi1111 2017-10-23 14:02:11 -05:00
commit c64321ebe9
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
components/PrivacyLevel.qml
View file

@ -116,7 +116,7 @@ Item {
Row { Row {
id: row2 id: row2
spacing: ((bar.width - 8) / 2) / 4 spacing: bar.width / 14
Repeater { Repeater {
model: 4 model: 4
@ -125,7 +125,7 @@ Item {
id: delegateItem2 id: delegateItem2
currentX: x + row2.x currentX: x + row2.x
currentIndex: index currentIndex: index
mainTick: currentIndex === 0 || currentIndex === 3 || currentIndex === 13 mainTick: currentIndex === 0
Component.onCompleted: { Component.onCompleted: {
row.positions[currentIndex] = delegateItem2 row.positions[currentIndex] = delegateItem2
} }
@ -135,7 +135,7 @@ Item {
Row { Row {
id: row1 id: row1
spacing: ((bar.width - 8) / 2) / 10 spacing: bar.width / 14
Repeater { Repeater {
model: 10 model: 10
@ -144,7 +144,7 @@ Item {
id: delegateItem1 id: delegateItem1
currentX: x + row1.x currentX: x + row1.x
currentIndex: index + 4 currentIndex: index + 4
mainTick: currentIndex === 0 || currentIndex === 3 || currentIndex === 13 mainTick: currentIndex === 13
Component.onCompleted: { Component.onCompleted: {
row.positions[currentIndex] = delegateItem1 row.positions[currentIndex] = delegateItem1
} }

3
components/TickDelegate.qml
View file

@ -53,7 +53,6 @@ Item {
color: "#4A4949" color: "#4A4949"
text: { text: {
if(currentIndex === 0) return qsTr("Normal") + translationManager.emptyString if(currentIndex === 0) return qsTr("Normal") + translationManager.emptyString
if(currentIndex === 3) return qsTr("Medium") + translationManager.emptyString
if(currentIndex === 13) return qsTr("High") + translationManager.emptyString if(currentIndex === 13) return qsTr("High") + translationManager.emptyString
return "" return ""
} }
@ -65,7 +64,7 @@ Item {
anchors.topMargin: 14 anchors.topMargin: 14
width: 1 width: 1
color: "#DBDBDB" color: "#DBDBDB"
height: currentIndex === 8 ? 16 : 8 height: 8
visible: !parent.mainTick visible: !parent.mainTick
} }
} }

2
pages/Transfer.qml
View file

@ -45,7 +45,7 @@ Rectangle {
property bool showAdvanced: false property bool showAdvanced: false
function scaleValueToMixinCount(scaleValue) { function scaleValueToMixinCount(scaleValue) {
var scaleToMixinCount = [4,5,6,7,8,9,10,11,12,13,14,15,20,25]; var scaleToMixinCount = [4,5,6,7,8,9,10,11,12,14,16,18,21,25];
if (scaleValue < scaleToMixinCount.length) { if (scaleValue < scaleToMixinCount.length) {
return scaleToMixinCount[scaleValue]; return scaleToMixinCount[scaleValue];
} else { } else {