Commit 740e7d54532028e850b546794ed57edac541f101
1 parent
f5634ecc76
Exists in
master
and in
2 other branches
엔코더 개선
Showing
2 changed files
with
11 additions
and
0 deletions
Show diff stats
app/gui/oven_control/coretempsettingpopup.cpp
| ... | ... | @@ -176,6 +176,8 @@ void CoreTempSettingPopup::focusCoreTempButton() |
| 176 | 176 | { |
| 177 | 177 | if (focusWidget() == ui->coreTempSlider) |
| 178 | 178 | ui->coreTempButton->setFocus(); |
| 179 | + | |
| 180 | + updateView(); | |
| 179 | 181 | } |
| 180 | 182 | |
| 181 | 183 | void CoreTempSettingPopup::updateView() |
| ... | ... | @@ -186,6 +188,10 @@ void CoreTempSettingPopup::updateView() |
| 186 | 188 | ui->curHumidityLabel->setText(QString::number(oven->currentHumidity())); |
| 187 | 189 | ui->targetHumidityLabel->setText(QString::number(oven->humidity())); |
| 188 | 190 | |
| 191 | + | |
| 192 | + QWidget *focused = focusWidget(); | |
| 193 | + ui->coreTempButton->setChecked(focused == ui->coreTempSlider); | |
| 194 | + | |
| 189 | 195 | switch (temperatureFormat()) |
| 190 | 196 | { |
| 191 | 197 | case Fahrenheit: |
| ... | ... | @@ -216,4 +222,6 @@ void CoreTempSettingPopup::on_coreTempButton_clicked() |
| 216 | 222 | { |
| 217 | 223 | ui->coreTempSlider->setFocus(); |
| 218 | 224 | focusCoreTempButtonTimer.start(); |
| 225 | + | |
| 226 | + updateView(); | |
| 219 | 227 | } | ... | ... |
app/gui/oven_control/coretempsettingpopup.ui
| ... | ... | @@ -449,6 +449,9 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_b |
| 449 | 449 | QPushButton:checked { image: url(:/images/slider_icon/core_temp_ov.png); } |
| 450 | 450 | QPushButton:pressed, QPushButton:focus { image: url(:/images/slider_icon/core_temp_ov.png); }</string> |
| 451 | 451 | </property> |
| 452 | + <property name="checkable"> | |
| 453 | + <bool>true</bool> | |
| 454 | + </property> | |
| 452 | 455 | <property name="style" stdset="0"> |
| 453 | 456 | <string>icon</string> |
| 454 | 457 | </property> | ... | ... |