projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix auto id 'that' blunder, tweak keyfrm popup speed undo
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
menuattachtransition.C
diff --git
a/cinelerra-5.1/cinelerra/menuattachtransition.C
b/cinelerra-5.1/cinelerra/menuattachtransition.C
index 13307fb9fc695f522a9176fa99d33788c3a24d87..efd0a823b955d252f74c783ff702e90b11bd69c9 100644
(file)
--- a/
cinelerra-5.1/cinelerra/menuattachtransition.C
+++ b/
cinelerra-5.1/cinelerra/menuattachtransition.C
@@
-123,7
+123,7
@@
TransitionDialog::TransitionDialog(MWindow *mwindow,
: BC_Window(_("Attach Transition"), x, y,
mwindow->session->transitiondialog_w,
mwindow->session->transitiondialog_h,
: BC_Window(_("Attach Transition"), x, y,
mwindow->session->transitiondialog_w,
mwindow->session->transitiondialog_h,
-
320, 240
, 1, 0, 1)
+
xS(320), yS(240)
, 1, 0, 1)
{
this->mwindow = mwindow;
this->thread = thread;
{
this->mwindow = mwindow;
this->thread = thread;
@@
-170,21
+170,21
@@
TransitionDefaultText::~TransitionDefaultText()
void TransitionDialog::create_objects()
{
void TransitionDialog::create_objects()
{
- int x =
10
;
- int y =
10
;
+ int x =
xS(10)
;
+ int y =
yS(10)
;
lock_window("TransitionDialog::create_objects");
add_subwindow(name_title = new BC_Title(x, y, _("Select transition from list")));
lock_window("TransitionDialog::create_objects");
add_subwindow(name_title = new BC_Title(x, y, _("Select transition from list")));
- y += name_title->get_h() +
5
;
+ y += name_title->get_h() +
yS(5)
;
add_subwindow(name_list = new TransitionDialogName(thread,
&thread->transition_names,
x,
y,
get_w() - x - x,
add_subwindow(name_list = new TransitionDialogName(thread,
&thread->transition_names,
x,
y,
get_w() - x - x,
- get_h() - y - BC_OKButton::calculate_h() -
100
));
- y += name_list->get_h() +
20
;
+ get_h() - y - BC_OKButton::calculate_h() -
yS(100)
));
+ y += name_list->get_h() +
yS(20)
;
add_subwindow(set_default = new TransitionSetDefault(this, x, y));
add_subwindow(set_default = new TransitionSetDefault(this, x, y));
- y += set_default->get_h() +
10
;
+ y += set_default->get_h() +
yS(10)
;
const char *default_transition = "";
EDL *edl = mwindow->edl;
switch( thread->data_type ) {
const char *default_transition = "";
EDL *edl = mwindow->edl;
switch( thread->data_type ) {
@@
-196,7
+196,7
@@
void TransitionDialog::create_objects()
break;
}
add_subwindow(set_default_text = new TransitionDefaultText(this, x, y,
break;
}
add_subwindow(set_default_text = new TransitionDefaultText(this, x, y,
- get_w()-x-
20
, default_transition));
+ get_w()-x-
xS(20)
, default_transition));
if( thread->number >= 0 ) {
name_list->update_selection(&thread->transition_names, thread->number, 0);
name_list->draw_items(0);
if( thread->number >= 0 ) {
name_list->update_selection(&thread->transition_names, thread->number, 0);
name_list->draw_items(0);
@@
-210,22
+210,21
@@
void TransitionDialog::create_objects()
int TransitionDialog::resize_event(int w, int h)
{
int TransitionDialog::resize_event(int w, int h)
{
- int x =
10
;
- int y =
10
;
+ int x =
xS(10)
;
+ int y =
yS(10)
;
name_title->reposition_window(x, y);
name_title->reposition_window(x, y);
- y += name_title->get_h() +
5
;
+ y += name_title->get_h() +
yS(5)
;
name_list->reposition_window(x, y,
name_list->reposition_window(x, y,
- w - x - x, h - y - BC_OKButton::calculate_h() -
100
);
- y += name_list->get_h() +
20
;
+ w - x - x, h - y - BC_OKButton::calculate_h() -
yS(100)
);
+ y += name_list->get_h() +
yS(20)
;
set_default->reposition_window(x, y);
set_default->reposition_window(x, y);
- y += set_default->get_h() +
10
;
- set_default_text->reposition_window(x, y, get_w()-x-
20
);
+ y += set_default->get_h() +
yS(10)
;
+ set_default_text->reposition_window(x, y, get_w()-x-
xS(20)
);
return 1;
}
return 1;
}
-
TransitionDialogName::TransitionDialogName(TransitionDialogThread *thread,
ArrayList<BC_ListBoxItem*> *standalone_data, int x, int y, int w, int h)
: BC_ListBox(x,
TransitionDialogName::TransitionDialogName(TransitionDialogThread *thread,
ArrayList<BC_ListBoxItem*> *standalone_data, int x, int y, int w, int h)
: BC_ListBox(x,
@@
-252,6
+251,3
@@
int TransitionDialogName::selection_changed()
return 1;
}
return 1;
}
-
-
-