projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
camera zoom fix, upgrade giflib, configure.ac ix86 probe tweaks, any python
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
statusbar.C
diff --git
a/cinelerra-5.1/cinelerra/statusbar.C
b/cinelerra-5.1/cinelerra/statusbar.C
index 6a0d622148658707f57eea0481add80b4a3bcee2..13169c870c53e7e5274432ede78f6adaed7af353 100644
(file)
--- a/
cinelerra-5.1/cinelerra/statusbar.C
+++ b/
cinelerra-5.1/cinelerra/statusbar.C
@@
-103,13
+103,13
@@
void StatusBar::resize_event()
flash(0);
}
flash(0);
}
-void StatusBar::show_message(const char *text, int color)
+void StatusBar::show_message(const char *text, int
msg_color, int box_
color)
{
int mx = mwindow->theme->mstatus_message_x;
int my = mwindow->theme->mstatus_message_y;
int tx = status_text->get_x(), th = status_text->get_h();
{
int mx = mwindow->theme->mstatus_message_x;
int my = mwindow->theme->mstatus_message_y;
int tx = status_text->get_x(), th = status_text->get_h();
- if( color >= 0 ) {
- set_color(color);
+ if(
box_
color >= 0 ) {
+ set_color(
box_
color);
int bb = th/4, bh = th - bb*2;
draw_box(mx+bb,my+bb, bh,bh);
flash(mx,my, th,th); mx += 5;
int bb = th/4, bh = th - bb*2;
draw_box(mx+bb,my+bb, bh,bh);
flash(mx,my, th,th); mx += 5;
@@
-121,10
+121,12
@@
void StatusBar::show_message(const char *text, int color)
flash(mx,my, th,th);
status_text->reposition_window(mx, my);
}
flash(mx,my, th,th);
status_text->reposition_window(mx, my);
}
- color = mwindow->theme->message_normal;
- status_text->set_color(color);
+ if( msg_color < 0 )
+ msg_color = mwindow->theme->message_normal;
+ status_text->set_color(msg_color);
status_text->update(text);
}
status_text->update(text);
}
+
void StatusBar::reset_default_message()
{
status_color = -1;
void StatusBar::reset_default_message()
{
status_color = -1;