Changeset 8d54c1f792cceda7ff91833afd133d9711c7a75b

Show
Ignore:
Timestamp:
07/28/02 03:46:26 (6 years ago)
Author:
Tony Castley <tcastley@videolan.org>
git-committer:
Tony Castley <tcastley@videolan.org> 1027820786 +0000
git-parent:

[5ef12c635d700b2ca7e2ea44ee1139f3d1c83892]

git-author:
Tony Castley <tcastley@videolan.org> 1027820786 +0000
Message:

Fixed lockup on some overlay enabled cards.
Fixed on top function.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • plugins/beos/vout_beos.cpp

    r64d33dc r8d54c1f  
    33 ***************************************************************************** 
    44 * Copyright (C) 2000, 2001 VideoLAN 
    5  * $Id: vout_beos.cpp,v 1.63 2002/07/23 00:39:16 sam Exp $ 
     5 * $Id: vout_beos.cpp,v 1.64 2002/07/28 01:46:26 tcastley Exp $ 
    66 * 
    77 * Authors: Jean-Marc Dressler <polux@via.ecp.fr> 
    …… 
    109109    teardownwindow = false; 
    110110    is_zoomed = false; 
     111    vsync = false; 
    111112    i_buffer = 0; 
    112113 
    …… 
    131132 
    132133    // remember current settings 
    133     i_width = frame.IntegerWidth(); 
    134     i_height = frame.IntegerHeight(); 
    135     FrameResized(frame.IntegerWidth(), frame.IntegerHeight()); 
     134    i_width = v_width; 
     135    i_height = v_height; 
     136    FrameResized(v_width, v_height); 
    136137 
    137138    if (mode == OVERLAY) 
    …… 
    140141 
    141142       bitmap[1]->GetOverlayRestrictions(&r); 
    142        SetSizeLimits((i_width * r.min_width_scale), i_width * r.max_width_scale, 
    143                      (i_height * r.min_height_scale), i_height * r.max_height_scale); 
     143       SetSizeLimits((i_width * r.min_width_scale) + 1, i_width * r.max_width_scale, 
     144                     (i_height * r.min_height_scale) + 1, i_height * r.max_height_scale); 
    144145    } 
    145146    Show(); 
    …… 
    432433            
    433434           BMessage *winFloatFeel = new BMessage(WINDOW_FEEL); 
    434            winFloatFeel->AddInt16("WinFeel", (int16)B_FLOATING_APP_WINDOW_FEEL); 
     435           winFloatFeel->AddInt16("WinFeel", (int16)B_MODAL_ALL_WINDOW_FEEL); 
    435436           BMenuItem *onTopWindItem = new BMenuItem("App Top", winFloatFeel); 
    436            onTopWindItem->SetMarked(vWindow->Feel() == B_FLOATING_APP_WINDOW_FEEL); 
     437           onTopWindItem->SetMarked(vWindow->Feel() == B_MODAL_ALL_WINDOW_FEEL); 
    437438           menu->AddItem(onTopWindItem); 
    438439