X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fremotecontrol.C;h=bb61eb277011e5c2508aef06cb0d680917bb84eb;hb=0e6cf5b52d1ebce9272270144bcf43df4683507e;hp=1fa93d9c215b5658565ddc1401ad17729fd43d29;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/cinelerra/remotecontrol.C b/cinelerra-5.1/cinelerra/remotecontrol.C index 1fa93d9c..bb61eb27 100644 --- a/cinelerra-5.1/cinelerra/remotecontrol.C +++ b/cinelerra-5.1/cinelerra/remotecontrol.C @@ -9,7 +9,7 @@ RemoteWindow::RemoteWindow(RemoteControl *remote_control) : BC_Window(_(PROGRAM_NAME ": RemoteWindow"), - 0, 0, 16, 16, -1, -1, 1, 0, 1) + 0, 0, xS(16), yS(16), -1, -1, 1, 0, 1) { this->remote_control = remote_control; } @@ -58,9 +58,11 @@ int RemoteControl::activate(RemoteHandler *handler) if( !handler ) handler = !mwindow_gui->record->running() ? (RemoteHandler *)mwindow_gui->cwindow_remote_handler : (RemoteHandler *)mwindow_gui->record_remote_handler ; + gui->lock_window("RemoteControl::activate"); gui->set_active(handler); gui->set_color(handler->color); gui->fill_color(handler->color); + gui->unlock_window(); result = 1; } active_lock->unlock(); @@ -100,7 +102,8 @@ void RemoteControl::fill_color(int color) } RemoteGUI::RemoteGUI(BC_WindowBase *wdw, RemoteControl *remote_control) - : BC_Popup(wdw, remote_control->mwindow_gui->mwindow->session->mwindow_x,0,16,16, -1, 1) + : BC_Popup(wdw, remote_control->mwindow_gui->mwindow->session->mwindow_x,0, + xS(16),yS(16), -1, 1) { this->remote_control = remote_control; }