diff --git a/BetButton.qml b/BetButton.qml index ee58121..0fcae2f 100644 --- a/BetButton.qml +++ b/BetButton.qml @@ -20,7 +20,7 @@ Item { border.width: 0 color: { - if (rouletteTable.numberOfBets < 2 || border.width == 2) { + if (rouletteTable.numberOfBets < 2 || border.width == 3) { if (tapHandler.pressed) { "#88999999" } else if (hoverHandler.hovered) { @@ -41,10 +41,10 @@ Item { onTapped: { if (rouletteTable.numberOfBets < 2 && parent.border.width == 0) { - parent.border.width = 2 + parent.border.width = 3 roulette.showBetInputDialog(betType, index_, betButton.parent.x + offsetX, betButton.parent.y + offsetY) - } else if (parent.border.width == 2) { + } else if (parent.border.width == 3) { parent.border.width = 0 PlayerAreaModel.removeBet(betType, index_) rouletteTable.numberOfBets -= 1 @@ -61,14 +61,14 @@ Item { rouletteTable.numberOfBets -=1 } - selected.border.width = 2; + selected.border.width = 3; rouletteTable.numberOfBets += 1 } else if (b2 == betType && n2 == index_) { if (selected.border.width != 0) { rouletteTable.numberOfBets -=1 } - selected.border.width = 2; + selected.border.width = 3; rouletteTable.numberOfBets += 1 } else { if (selected.border.width != 0) { diff --git a/CMakeLists.txt b/CMakeLists.txt index d1bec5a..2112aa3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,6 +42,7 @@ qt_add_qml_module(roulette-payout Columns.qml Dozens.qml Singles.qml + RedBlack.qml ) diff --git a/RedBlack.qml b/RedBlack.qml new file mode 100644 index 0000000..701eed3 --- /dev/null +++ b/RedBlack.qml @@ -0,0 +1,34 @@ +import QtQuick + +import roulette + +Item { + /* RED */ + Item { + x: 236 + y: 231 + BetButton { + index_: 37 + betType: 1 + height: 26 + width: 73 + offsetX: 50 + offsetY: 23 + } + } + + /* BLACK */ + Item { + x: 310 + y: 231 + BetButton { + index_: 38 + betType: 2 + height: 26 + width: 73 + offsetX: 50 + offsetY: 23 + } + } + +} diff --git a/Roulette.qml b/Roulette.qml index 68a375c..813b06d 100644 --- a/Roulette.qml +++ b/Roulette.qml @@ -28,7 +28,10 @@ Item { Dozens { } - Singles{ + Singles { + } + + RedBlack { } }