Skip to content

Commit e07bee5

Browse files
committed
fix infinitive call bug
1 parent 7b7d64b commit e07bee5

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

src/tools.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ extern QSlider *scrollVSlider;
4646

4747
extern QWidget *mainWidget;
4848

49+
extern void updateRatioButtons();
4950
extern void updateGoBackButtons();
5051
extern void backgroundStyleEvent();
5152
extern void penStyleEvent();

src/tools/background.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ void setupBackground(){
9595
if (!filename.isEmpty()) {
9696
board->overlays[drawing->getPageNum()] = QImage(filename);
9797
board->ratios[drawing->getPageNum()] = 100;
98-
updateGoBackButtons();
98+
updateRatioButtons();
9999
}
100100
floatingWidget->show();
101101
setHideMainWindow(false);
@@ -108,13 +108,13 @@ void setupBackground(){
108108

109109
overlayScaleUp = create_button(":images/zoom-in.svg", [=](){
110110
board->ratios[drawing->getPageNum()] += 10;
111-
updateGoBackButtons();
111+
updateRatioButtons();
112112
board->update();
113113
});
114114

115115
overlayScaleDown = create_button(":images/zoom-out.svg", [=](){
116116
board->ratios[drawing->getPageNum()] -= 10;
117-
updateGoBackButtons();
117+
updateRatioButtons();
118118
board->update();
119119
});
120120

src/tools/update.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,16 +102,18 @@ void penSizeEvent(){
102102
thicknessLabel->setText(QString(_("Size:"))+QString(" ")+QString::number(value));
103103
}
104104

105+
void updateRatioButtons(){
106+
overlayScaleDown->setEnabled(board->ratios[drawing->getPageNum()] >= 30);
107+
overlayScaleUp->setEnabled(board->ratios[drawing->getPageNum()] <= 200);
108+
}
109+
105110
void updateGoBackButtons(){
106111
backButton->setEnabled(drawing->isBackAvailable());
107112
nextButton->setEnabled(drawing->isNextAvailable());
108113
previousPage->setEnabled(drawing->getPageNum() > 0);
109114
pageLabel->setText(QString::number(drawing->getPageNum()));
110-
overlayScaleDown->setEnabled(board->ratios[drawing->getPageNum()] >= 30);
111-
overlayScaleUp->setEnabled(board->ratios[drawing->getPageNum()] <= 200);
112115
}
113116

114-
115117
void backgroundStyleEvent(){
116118
transparentButton->setStyleSheet(QString("background-color: none;"));
117119
blackButton->setStyleSheet(QString("background-color: none;"));

0 commit comments

Comments
 (0)