re-apply sams ladspa icons, drop gtk from ydiff, gradient reset btn

[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 b7c46fd5047e7e39c7096afa1726ac5e578295bb..9cca7fa56ec73eb89895ab442c671152fb4b4fd5 100644 (file)
--- a/cinelerra-5.1/cinelerra/preferencesthread.C
+++ b/cinelerra-5.1/cinelerra/preferencesthread.C
@@ -211,6 +211,13 @@ int PreferencesThread::apply_settings()
                (*this_aconfig != *aconfig) || (*this_vconfig != *vconfig) ||
                !preferences->brender_asset->equivalent(*mwindow->preferences->brender_asset, 0, 1, edl);
 
+       if( preferences->highlight_inverse != mwindow->preferences->highlight_inverse ) {
+               mwindow->gui->lock_window("PreferencesThread::apply_settings 0");
+               mwindow->gui->hide_cursor(0);
+               mwindow->gui->unlock_window();
+               redraw_overlays = 1;
+       }
+
        if( strcmp(preferences->theme, mwindow->preferences->theme) != 0 )
                mwindow->restart_status = -1; // reload, need new bcresources
        if( strcmp(preferences->plugin_icons, mwindow->preferences->plugin_icons) != 0 )
@@ -223,6 +230,7 @@ int PreferencesThread::apply_settings()
        BC_Signals::set_catch_segv(mwindow->preferences->trap_sigsegv);
        BC_Signals::set_catch_intr(mwindow->preferences->trap_sigintr);
        BC_WindowBase::get_resources()->popupmenu_btnup = mwindow->preferences->popupmenu_btnup;
+       BC_WindowBase::get_resources()->grab_input_focus = mwindow->preferences->grab_input_focus;
        BC_WindowBase::get_resources()->textbox_focus_policy = mwindow->preferences->textbox_focus_policy;
        if( mwindow->preferences->trap_sigsegv || mwindow->preferences->trap_sigintr ) {
                BC_Trace::enable_locks();
@@ -291,6 +299,7 @@ int PreferencesThread::apply_settings()
        if(redraw_overlays)
        {
                mwindow->gui->lock_window("PreferencesThread::apply_settings 2");
+               mwindow->gui->show_cursor(0);
                mwindow->gui->draw_overlays(1);
                mwindow->gui->unlock_window();
        }
@@ -308,10 +317,7 @@ int PreferencesThread::apply_settings()
 //printf("PreferencesThread::apply_settings 1\n");
 // This doesn't stop and restart, only reloads the assets before
 // the next play command.
-               mwindow->cwindow->playback_engine->que->send_command(CURRENT_FRAME,
-                       CHANGE_ALL,
-                       mwindow->edl,
-                       1);
+               mwindow->cwindow->refresh_frame(CHANGE_ALL, mwindow->edl);
 //printf("PreferencesThread::apply_settings 10\n");
        }