projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version update
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
tipwindow.C
diff --git
a/cinelerra-5.1/cinelerra/tipwindow.C
b/cinelerra-5.1/cinelerra/tipwindow.C
index 5ad9092726f1a8be181e84eb5faa1d3ac05c2f3d..6014b50402243a53135e8d86c21e1845134fc667 100644
(file)
--- a/
cinelerra-5.1/cinelerra/tipwindow.C
+++ b/
cinelerra-5.1/cinelerra/tipwindow.C
@@
-117,7
+117,7
@@
void TipWindow::prev_tip()
TipWindowGUI::TipWindowGUI(MWindow *mwindow, TipWindow *thread, int x, int y)
: BC_Window(_(PROGRAM_NAME ": Tip of the day"), x, y,
TipWindowGUI::TipWindowGUI(MWindow *mwindow, TipWindow *thread, int x, int y)
: BC_Window(_(PROGRAM_NAME ": Tip of the day"), x, y,
-
640, 100, 640, 100
, 0, 0, 1)
+
xS(640), yS(110), xS(640), yS(110)
, 0, 0, 1)
{
this->mwindow = mwindow;
this->thread = thread;
{
this->mwindow = mwindow;
this->thread = thread;
@@
-126,20
+126,21
@@
TipWindowGUI::TipWindowGUI(MWindow *mwindow, TipWindow *thread, int x, int y)
void TipWindowGUI::create_objects()
{
lock_window("TipWindowGUI::create_objects");
void TipWindowGUI::create_objects()
{
lock_window("TipWindowGUI::create_objects");
- int x = 10, y = 10;
- add_subwindow(tip_text = new BC_Title(x, y, thread->get_current_tip(0)));
- y = get_h() - 30;
+ int xs10 = xS(10), ys10 = yS(10), ys30 = yS(30);
+ int x = xs10, y = ys10;
+ add_subwindow(tip_text = new BC_Title(x, y, thread->get_current_tip(1)));
+ y = get_h() - ys30;
BC_CheckBox *checkbox;
add_subwindow(checkbox = new TipDisable(mwindow, this, x, y));
BC_Button *button;
BC_CheckBox *checkbox;
add_subwindow(checkbox = new TipDisable(mwindow, this, x, y));
BC_Button *button;
- y = get_h() - TipClose::calculate_h(mwindow) - 10;
- x = get_w() - TipClose::calculate_w(mwindow) - 10;
+ y = get_h() - TipClose::calculate_h(mwindow) -
ys
10;
+ x = get_w() - TipClose::calculate_w(mwindow) -
xs
10;
add_subwindow(button = new TipClose(mwindow, this, x, y));
add_subwindow(button = new TipClose(mwindow, this, x, y));
- x -= TipNext::calculate_w(mwindow) + 10;
+ x -= TipNext::calculate_w(mwindow) +
xs
10;
add_subwindow(button = new TipNext(mwindow, this, x, y));
add_subwindow(button = new TipNext(mwindow, this, x, y));
- x -= TipPrev::calculate_w(mwindow) + 10;
+ x -= TipPrev::calculate_w(mwindow) +
xs
10;
add_subwindow(button = new TipPrev(mwindow, this, x, y));
add_subwindow(button = new TipPrev(mwindow, this, x, y));
- x += button->get_w() + 10;
+ x += button->get_w() +
xs
10;
show_window();
raise_window();
show_window();
raise_window();
@@
-155,7
+156,7
@@
int TipWindowGUI::keypress_event()
set_done(0);
break;
}
set_done(0);
break;
}
- return
0
;
+ return
context_help_check_and_show()
;
}
}