auto keyframe color prefs, colorpicker rework, ru.po update, keyframe align fixes...

[goodguy/history.git] / cinelerra-5.1 / cinelerra / preferencesthread.C

diff --git a/cinelerra-5.1/cinelerra/preferencesthread.C b/cinelerra-5.1/cinelerra/preferencesthread.C
index 417f41f7aac8828a74ceba703f76fcd1a439b942..853c7a7012bbdeeda75fa368fb3aea184b6aedfe 100644 (file)
--- a/cinelerra-5.1/cinelerra/preferencesthread.C
+++ b/cinelerra-5.1/cinelerra/preferencesthread.C
@@ -519,6 +519,7 @@ int PreferencesWindow::set_current_dialog(int number)
 //printf("PreferencesWindow::set_current_dialog %d\n", __LINE__);
                dialog->create_objects();
 //printf("PreferencesWindow::set_current_dialog %d\n", __LINE__);
+               dialog->lower_window();
                dialog->show_window(0);
        }
 
@@ -598,12 +599,16 @@ PreferencesApply::PreferencesApply(MWindow *mwindow, PreferencesThread *thread)
        this->mwindow = mwindow;
        this->thread = thread;
 }
-
 int PreferencesApply::handle_event()
 {
        thread->apply_settings();
        return 1;
 }
+int PreferencesApply::resize_event(int w, int h)
+{
+       reposition_window(w/2 - get_w()/2, h-get_h()-10);
+       return 1;
+}
 
 
 
@@ -616,7 +621,6 @@ PreferencesOK::PreferencesOK(MWindow *mwindow, PreferencesThread *thread)
        this->mwindow = mwindow;
        this->thread = thread;
 }
-
 int PreferencesOK::keypress_event()
 {
        if(get_keypress() == RETURN)
@@ -631,6 +635,11 @@ int PreferencesOK::handle_event()
        thread->window->set_done(0);
        return 1;
 }
+int PreferencesOK::resize_event(int w, int h)
+{
+       reposition_window(10, h-get_h()-10);
+       return 1;
+}
 
 
 
@@ -651,12 +660,16 @@ int PreferencesCancel::keypress_event()
        }
        return 0;
 }
-
 int PreferencesCancel::handle_event()
 {
        thread->window->set_done(1);
        return 1;
 }
+int PreferencesCancel::resize_event(int w, int h)
+{
+       reposition_window(w-get_w()-10, h-get_h()-10);
+       return 1;
+}