projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
titler fixes, auto paste bug, resize popup hang, focus policy fix, chk lang
[goodguy/history.git]
/
cinelerra-5.1
/
guicast
/
bctextbox.C
diff --git
a/cinelerra-5.1/guicast/bctextbox.C
b/cinelerra-5.1/guicast/bctextbox.C
index cbd74e0623c45760221fe5dec44075d23d81ce04..6916f2e1777d0943ec09c910a954bf1a06237b8b 100644
(file)
--- a/
cinelerra-5.1/guicast/bctextbox.C
+++ b/
cinelerra-5.1/guicast/bctextbox.C
@@
-753,7
+753,6
@@
int BC_TextBox::cursor_enter_event()
if( top_level->event_win == win && enabled &&
!(top_level->get_resources()->textbox_focus_policy & CLICK_ACTIVATE) )
{
if( top_level->event_win == win && enabled &&
!(top_level->get_resources()->textbox_focus_policy & CLICK_ACTIVATE) )
{
- tooltip_done = 0;
if( !active ) {
top_level->deactivate();
activate();
if( !active ) {
top_level->deactivate();
activate();
@@
-777,7
+776,7
@@
int BC_TextBox::cursor_leave_event()
draw_border();
flash(1);
}
draw_border();
flash(1);
}
- if( !suggestions_popup && !get_button
press
() &&
+ if( !suggestions_popup && !get_button
_down
() &&
!(top_level->get_resources()->textbox_focus_policy & CLICK_DEACTIVATE) )
deactivate();
return 0;
!(top_level->get_resources()->textbox_focus_policy & CLICK_DEACTIVATE) )
deactivate();
return 0;
@@
-1014,7
+1013,6
@@
int BC_TextBox::repeat_event(int64_t duration)
tooltip_text && tooltip_text[0] != 0 && highlighted)
{
show_tooltip();
tooltip_text && tooltip_text[0] != 0 && highlighted)
{
show_tooltip();
- tooltip_done = 1;
result = 1;
}
result = 1;
}
@@
-2362,6
+2360,7
@@
int BC_PopupTextBoxList::handle_event()
if(item)
{
popup->textbox->update(item->get_text());
if(item)
{
popup->textbox->update(item->get_text());
+ popup->textbox->set_text_row(0);
popup->handle_event();
}
return 1;
popup->handle_event();
}
return 1;
@@
-2410,14
+2409,12
@@
int BC_PopupTextBox::create_objects()
void BC_PopupTextBox::update(const char *text)
{
textbox->update(text);
void BC_PopupTextBox::update(const char *text)
{
textbox->update(text);
+ textbox->set_text_row(0);
}
void BC_PopupTextBox::update_list(ArrayList<BC_ListBoxItem*> *data)
{
}
void BC_PopupTextBox::update_list(ArrayList<BC_ListBoxItem*> *data)
{
- listbox->update(data,
- 0,
- 0,
- 1);
+ listbox->update(data, 0, 0, 1);
}
}
@@
-2456,6
+2453,16
@@
int BC_PopupTextBox::get_h()
return textbox->get_h();
}
return textbox->get_h();
}
+int BC_PopupTextBox::get_show_query()
+{
+ return listbox->get_show_query();
+}
+
+void BC_PopupTextBox::set_show_query(int v)
+{
+ listbox->set_show_query(v);
+}
+
int BC_PopupTextBox::handle_event()
{
return 1;
int BC_PopupTextBox::handle_event()
{
return 1;
@@
-2696,18
+2703,21
@@
BC_TextBox* BC_TumbleTextBox::get_textbox()
int BC_TumbleTextBox::update(const char *value)
{
textbox->update(value);
int BC_TumbleTextBox::update(const char *value)
{
textbox->update(value);
+ textbox->set_text_row(0);
return 0;
}
int BC_TumbleTextBox::update(int64_t value)
{
textbox->update(value);
return 0;
}
int BC_TumbleTextBox::update(int64_t value)
{
textbox->update(value);
+ textbox->set_text_row(0);
return 0;
}
int BC_TumbleTextBox::update(float value)
{
textbox->update(value);
return 0;
}
int BC_TumbleTextBox::update(float value)
{
textbox->update(value);
+ textbox->set_text_row(0);
return 0;
}
return 0;
}
@@
-2786,3
+2796,9
@@
void BC_TumbleTextBox::set_boundaries(float min, float max)
{
tumbler->set_boundaries(min, max);
}
{
tumbler->set_boundaries(min, max);
}
+
+void BC_TumbleTextBox::set_tooltip(const char *text)
+{
+ textbox->set_tooltip(text);
+}
+