confirm prefs update, fix bg_pixmap sz, plugin layout tweaks

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / zwindowgui.C

diff --git a/cinelerra-5.1/cinelerra/zwindowgui.C b/cinelerra-5.1/cinelerra/zwindowgui.C
index bada1625e68e7fff709ccd62edaa0ead71857325..1ffa772d77e2cb0c31a0b6ba8def317abd071c80 100644 (file)
--- a/cinelerra-5.1/cinelerra/zwindowgui.C
+++ b/cinelerra-5.1/cinelerra/zwindowgui.C
@@ -39,7 +39,7 @@
 
 ZWindowGUI::ZWindowGUI(MWindow *mwindow, ZWindow *zwindow, Mixer *mixer)
  : BC_Window(zwindow->title, mixer->x, mixer->y, mixer->w, mixer->h,
-       100, 75, 1, 1, 0)
+       xS(100), yS(75), 1, 1, 0)
 {
        this->mwindow = mwindow;
        this->zwindow = zwindow;
@@ -59,7 +59,8 @@ void ZWindowGUI::create_objects()
 {
        lock_window("ZWindowGUI::create_objects");
 
-       canvas = new ZWindowCanvas(mwindow, this, 10,10, get_w()-20,get_h()-20);
+       canvas = new ZWindowCanvas(mwindow, this,
+                       xS(10),yS(10), get_w()-xS(20),get_h()-yS(20));
        canvas->create_objects(mwindow->edl);
        playback_engine = new PlaybackEngine(mwindow, canvas);
        playback_engine->create_objects();
@@ -71,7 +72,8 @@ void ZWindowGUI::create_objects()
 
 int ZWindowGUI::resize_event(int w, int h)
 {
-       canvas->reposition_window(0, 10,10, w-20,h-20);
+       canvas->reposition_window(0,
+                       xS(10),yS(10), w-xS(20),h-yS(20));
        zwindow->reposition(get_x(), get_y(), w, h);
        BC_WindowBase::resize_event(w, h);
        return 1;
@@ -98,13 +100,13 @@ int ZWindowGUI::keypress_event()
        int result = 1;
        switch( key ) {
        case 'f':
-               if( mwindow->session->zwindow_fullscreen )
+               if( canvas->get_fullscreen() )
                        canvas->stop_fullscreen();
                else
                        canvas->start_fullscreen();
                break;
        case ESC:
-               if( mwindow->session->zwindow_fullscreen )
+               if( canvas->get_fullscreen() )
                        canvas->stop_fullscreen();
                break;
        default:
@@ -246,13 +248,3 @@ void ZWindowCanvas::draw_refresh(int flush)
                cvs->flash(flush);
 }
 
-int ZWindowCanvas::get_fullscreen()
-{
-       return mwindow->session->zwindow_fullscreen;
-}
-
-void ZWindowCanvas::set_fullscreen(int value)
-{
-       mwindow->session->zwindow_fullscreen = value;
-}
-