Skip to content

Commit c3247d8

Browse files
committed
Merge pull request #106423 from YeldhamDev/that_is_a_big_scrollbar_btw
Hide scrollbar in the audio stream importer dialog when unneeded
2 parents f33f013 + bbe9994 commit c3247d8

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

editor/import/audio_stream_import_settings.cpp

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,10 @@ void AudioStreamImportSettingsDialog::_preview_zoom_in() {
184184
return;
185185
}
186186
float page_size = zoom_bar->get_page();
187+
zoom_spacer->hide();
187188
zoom_bar->set_page(page_size * 0.5);
188189
zoom_bar->set_value(zoom_bar->get_value() + page_size * 0.25);
190+
zoom_bar->show();
189191

190192
_preview->queue_redraw();
191193
_indicator->queue_redraw();
@@ -198,6 +200,10 @@ void AudioStreamImportSettingsDialog::_preview_zoom_out() {
198200
float page_size = zoom_bar->get_page();
199201
zoom_bar->set_page(MIN(zoom_bar->get_max(), page_size * 2.0));
200202
zoom_bar->set_value(zoom_bar->get_value() - page_size * 0.5);
203+
if (zoom_bar->get_value() == 0) {
204+
zoom_bar->hide();
205+
zoom_spacer->show();
206+
}
201207

202208
_preview->queue_redraw();
203209
_indicator->queue_redraw();
@@ -210,6 +216,9 @@ void AudioStreamImportSettingsDialog::_preview_zoom_reset() {
210216
zoom_bar->set_max(stream->get_length());
211217
zoom_bar->set_page(zoom_bar->get_max());
212218
zoom_bar->set_value(0);
219+
zoom_bar->hide();
220+
zoom_spacer->show();
221+
213222
_preview->queue_redraw();
214223
_indicator->queue_redraw();
215224
}
@@ -608,6 +617,7 @@ AudioStreamImportSettingsDialog::AudioStreamImportSettingsDialog() {
608617

609618
HBoxContainer *zoom_hbox = memnew(HBoxContainer);
610619
zoom_bar = memnew(HScrollBar);
620+
zoom_bar->hide();
611621
zoom_in = memnew(Button);
612622
zoom_in->set_accessibility_name(TTRC("Zoom In"));
613623
zoom_in->set_flat(true);
@@ -618,6 +628,7 @@ AudioStreamImportSettingsDialog::AudioStreamImportSettingsDialog() {
618628
zoom_out->set_accessibility_name(TTRC("Zoom Out"));
619629
zoom_out->set_flat(true);
620630
zoom_hbox->add_child(zoom_bar);
631+
zoom_spacer = zoom_hbox->add_spacer();
621632
zoom_bar->set_h_size_flags(Control::SIZE_EXPAND_FILL);
622633
zoom_bar->set_v_size_flags(Control::SIZE_EXPAND_FILL);
623634
zoom_hbox->add_child(zoom_out);

editor/import/audio_stream_import_settings.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ class AudioStreamImportSettingsDialog : public ConfirmationDialog {
5959
Label *_duration_label = nullptr;
6060

6161
HScrollBar *zoom_bar = nullptr;
62+
Control *zoom_spacer = nullptr;
6263
Button *zoom_in = nullptr;
6364
Button *zoom_reset = nullptr;
6465
Button *zoom_out = nullptr;

0 commit comments

Comments
 (0)