X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbctextbox.C;h=725bbfa56683a9d46bd41e3e0dcb1f444ff6029a;hb=78d1d3d26843ec91b048befb13569e6a1d54c065;hp=a7c8f5f7570ff1ce45d55bb65aaf1fded2da3007;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/guicast/bctextbox.C b/cinelerra-5.1/guicast/bctextbox.C index a7c8f5f7..725bbfa5 100644 --- a/cinelerra-5.1/guicast/bctextbox.C +++ b/cinelerra-5.1/guicast/bctextbox.C @@ -2628,17 +2628,6 @@ void BC_PopupTextBox::reposition_window(int x, int y) - - - - - - - - - - - BC_TumbleTextBoxText::BC_TumbleTextBoxText(BC_TumbleTextBox *popup, int64_t default_value, int x, int y) : BC_TextBox(x, y, popup->text_w, 1, default_value) @@ -2684,14 +2673,9 @@ int BC_TumbleTextBoxText::button_press_event() - BC_TumbleTextBox::BC_TumbleTextBox(BC_WindowBase *parent_window, - int64_t default_value, - int64_t min, - int64_t max, - int x, - int y, - int text_w) + int64_t default_value, int64_t min, int64_t max, + int x, int y, int text_w) { reset(); this->x = x; @@ -2707,12 +2691,8 @@ BC_TumbleTextBox::BC_TumbleTextBox(BC_WindowBase *parent_window, } BC_TumbleTextBox::BC_TumbleTextBox(BC_WindowBase *parent_window, - int default_value, - int min, - int max, - int x, - int y, - int text_w) + int default_value, int min, int max, + int x, int y, int text_w) { reset(); this->x = x; @@ -2728,12 +2708,8 @@ BC_TumbleTextBox::BC_TumbleTextBox(BC_WindowBase *parent_window, } BC_TumbleTextBox::BC_TumbleTextBox(BC_WindowBase *parent_window, - float default_value_f, - float min_f, - float max_f, - int x, - int y, - int text_w) + float default_value_f, float min_f, float max_f, + int x, int y, int text_w, int precision) { reset(); this->x = x; @@ -2742,9 +2718,9 @@ BC_TumbleTextBox::BC_TumbleTextBox(BC_WindowBase *parent_window, this->max_f = max_f; this->default_value_f = default_value_f; this->text_w = text_w; + this->precision = precision; this->parent_window = parent_window; use_float = 1; - precision = 4; increment = 1; } @@ -2799,13 +2775,27 @@ int BC_TumbleTextBox::create_objects() x += textbox->get_w(); tumbler = use_float ? - (BC_Tumbler *)new BC_FTumbler(textbox, min_f, max_f, x, y) : - (BC_Tumbler *)new BC_ITumbler(textbox, min, max, x, y); + (BC_Tumbler *)new BC_FTextTumbler(this, min_f, max_f, x, y) : + (BC_Tumbler *)new BC_ITextTumbler(this, min, max, x, y); parent_window->add_subwindow(tumbler); tumbler->set_increment(increment); return 0; } +int BC_TumbleTextBox::handle_up_event() +{ + return use_float ? + ((BC_FTumbler *)tumbler)->BC_FTumbler::handle_up_event() : + ((BC_ITumbler *)tumbler)->BC_ITumbler::handle_up_event() ; +} + +int BC_TumbleTextBox::handle_down_event() +{ + return use_float ? + ((BC_FTumbler *)tumbler)->BC_FTumbler::handle_down_event() : + ((BC_ITumbler *)tumbler)->BC_ITumbler::handle_down_event() ; +} + const char* BC_TumbleTextBox::get_text() { return textbox->get_text();