Changeset 864

Timestamp:

06/04/07 06:18:32 (2 years ago)

Author:

ok_computer

Message:

More sensible size hints for opengl store widget.

Files:

• trunk/jahwidgets/src/qt3/widgets/opengl_store.cpp (modified) (11 diffs)

trunk/jahwidgets/src/qt3/widgets/opengl_store.cpp

@@ -98 +98 @@
         void resizeGL( int w, int h )
         {
-                prop_width_.set( w );
-                prop_height_.set( h );
                 glViewport( 0, 0, w, h );
         }
@@ -159 +157 @@
                 int orig_phy_h = media_->phy_h( );
 
+                prop_width_.set( orig_phy_w );
+                prop_height_.set( orig_phy_h );
+
                 // Size the media
                 int phy_w, phy_h, req_w, req_h;
@@ -179 +180 @@
 
                 // Check for edge cases and abort if possible
-                if ( off_x + req_w < 0 || off_y + req_h < 0 || off_x > width( ) || off_y > height( ) )
+                if ( off_x + req_w < 0 || off_y + req_h < 0 || off_x > owner_->width( ) || off_y > owner_->height( ) )
                         return;
 
@@ -355 +356 @@
                         glPushMatrix( );
                         glLoadIdentity( );
-                        gluOrtho2D( 0.0f, width( ), 0.0f, height( ) );
+                        gluOrtho2D( 0.0f, owner_->width( ), 0.0f, owner_->height( ) );
 
                         glMatrixMode( GL_MODELVIEW );
@@ -361 +362 @@
                         glLoadIdentity( );
 
-                        glTranslatef( off_x, height( ) - off_y - req_h, 0.0f );
+                        glTranslatef( off_x, owner_->height( ) - off_y - req_h, 0.0f );
 
                         glTranslatef( req_w * media_->rotate_x( ), req_h * media_->rotate_y( ), 0.0f );
@@ -443 +444 @@
 
                         // Display the image at the correct aspect ratio and scaled to fill as much as possible
-                        glWindowPos2f( off_x, height( ) - off_y - req_h );
+                        glWindowPos2f( off_x, owner_->height( ) - off_y - req_h );
                         glPixelZoom( ( ( float )req_w / phy_w ), ( ( float )req_h / phy_h ) );
                         glDrawPixels( phy_w, phy_h, glformat.second, type, new_im->data( ) );
@@ -450 +451 @@
                         glPushMatrix( );
                         glLoadIdentity( );
-                        gluOrtho2D( 0.0f, width( ), 0.0f, height( ) );
+                        gluOrtho2D( 0.0f, owner_->width( ), 0.0f, owner_->height( ) );
 
                         glMatrixMode( GL_MODELVIEW );
@@ -456 +457 @@
                         glLoadIdentity( );
 
-                        glTranslatef( off_x, height( ) - off_y - req_h, 0.0f );
+                        glTranslatef( off_x, owner_->height( ) - off_y - req_h, 0.0f );
 
                         glTranslatef( req_w * media_->rotate_x( ), req_h * media_->rotate_y( ), 0.0f );
@@ -486 +487 @@
 
                 // This is the absolute WxH we have
-                int abs_w = width();
-                int abs_h = height();
+                int abs_w = owner_->width();
+                int abs_h = owner_->height();
 
                 // Should get the ar from the frame or the previous value
@@ -568 +569 @@
         void media_geometry( MediaPtr media, int req_w, int req_h )
         {
-                float off_x = ( media->x( ) * width( ) ) + ( ( width( ) * media->w( ) ) - req_w ) * media->align_h( ) / 2;
-                float off_y = ( media->y( ) * height( ) ) + ( ( height( ) * media->h( ) ) - req_h ) * media->align_v( ) / 2;
+                float off_x = ( media->x( ) * owner_->width( ) ) + ( ( owner_->width( ) * media->w( ) ) - req_w ) * media->align_h( ) / 2;
+                float off_y = ( media->y( ) * owner_->height( ) ) + ( ( owner_->height( ) * media->h( ) ) - req_h ) * media->align_v( ) / 2;
                 media->set_geometry( int( off_x ), int( off_y ), req_w, req_h );
         }
@@ -693 +694 @@
 QSize opengl_store::minimumSizeHint() const
 {
+    return QSize( 200, 100 );
+}
+
+QSize opengl_store::sizeHint() const
+{
     return QSize( impl_->width(), impl_->height() );
 }
 
-QSize opengl_store::sizeHint() const
-{
-    return minimumSizeHint();
-}
-
 void opengl_store::initializeGL( )
 {