fix for vframe get_temp blunder, vicon zoom tweak

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

diff --git a/cinelerra-5.1/cinelerra/awindowgui.C b/cinelerra-5.1/cinelerra/awindowgui.C
index 5756453c95909b92be6acaba48078e253e95d626..b370b2c3f542ac048996b144e6dbd890cc854410 100644 (file)
--- a/cinelerra-5.1/cinelerra/awindowgui.C
+++ b/cinelerra-5.1/cinelerra/awindowgui.C
@@ -331,7 +331,7 @@ int AssetViewPopup::button_press_event()
        int dir = 1, button = get_buttonpress();
        switch( button ) {
        case WHEEL_DOWN: dir = -1; // fall thru
-       case WHEEL_UP:   return zoom_scale(dir);
+       case WHEEL_UP:   return avt->zoom_scale(dir);
        case LEFT_BUTTON:
                break;
        default:
@@ -573,8 +573,8 @@ ViewPopup *AssetVIconThread::new_view_window()
        int vx = viewing->get_vx(), rx = 0;
        int vy = viewing->get_vy(), ry = 0;
        wdw->get_root_coordinates(vx, vy, &rx, &ry);
-       rx += (rx >= cx ? -view_w : viewing->w);
-       ry += (ry >= cy ? -view_h : viewing->h);
+       rx += (rx >= cx ? -view_w+viewing->w/4 : viewing->w-viewing->w/4);
+       ry += (ry >= cy ? -view_h+viewing->h/4 : viewing->h-viewing->h/4);
        AssetViewPopup *popup = new AssetViewPopup(this, draw_mode,
                rx, ry, view_w, view_h);
        if( draw_mode == ASSET_VIEW_MEDIA_MAP )
@@ -2570,7 +2570,7 @@ int AWindowAssets::button_press_event()
                case WHEEL_UP: {
                        int x = get_cursor_x(), y = get_cursor_y();
                        if( avt->cursor_inside(x, y) && avt->view_win )
-                               return avt->view_win->zoom_scale(dir);
+                               return avt->zoom_scale(dir);
                        return 1; }
                }
        }