Fix wrong SELECT size with multiple SELECT elements in OSR mode

demos/Lazarus/OSRExternalPumpBrowser/OSRExternalPumpBrowser.lps

@@ -22,8 +22,8 @@
         <ResourceBaseClass Value="Form"/>
         <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
-        <TopLine Value="313"/>
-        <CursorPos X="21" Y="328"/>
+        <TopLine Value="456"/>
+        <CursorPos X="19" Y="488"/>
         <UsageCount Value="26"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -62,55 +62,55 @@
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
         <Filename Value="uOSRExternalPumpBrowser.pas"/>
-        <Caret Line="323" Column="23" TopLine="299"/>
+        <Caret Line="271" TopLine="270"/>
       </Position1>
       <Position2>
         <Filename Value="uOSRExternalPumpBrowser.pas"/>
-        <Caret Line="95" Column="36" TopLine="84"/>
+        <Caret Line="286" Column="70" TopLine="270"/>
       </Position2>
       <Position3>
         <Filename Value="uOSRExternalPumpBrowser.pas"/>
-        <Caret Line="271" TopLine="270"/>
+        <Caret Line="307" Column="11" TopLine="295"/>
       </Position3>
       <Position4>
         <Filename Value="uOSRExternalPumpBrowser.pas"/>
-        <Caret Line="286" Column="70" TopLine="270"/>
+        <Caret Line="322" TopLine="313"/>
       </Position4>
       <Position5>
         <Filename Value="uOSRExternalPumpBrowser.pas"/>
-        <Caret Line="307" Column="11" TopLine="295"/>
+        <Caret Line="503" Column="53" TopLine="488"/>
       </Position5>
       <Position6>
         <Filename Value="uOSRExternalPumpBrowser.pas"/>
-        <Caret Line="322" TopLine="313"/>
+        <Caret Line="92" Column="27" TopLine="92"/>
       </Position6>
       <Position7>
         <Filename Value="uOSRExternalPumpBrowser.pas"/>
-        <Caret Line="503" Column="53" TopLine="488"/>
+        <Caret Line="503" Column="11" TopLine="499"/>
       </Position7>
       <Position8>
         <Filename Value="uOSRExternalPumpBrowser.pas"/>
-        <Caret Line="92" Column="27" TopLine="92"/>
+        <Caret Line="201" Column="11" TopLine="166"/>
       </Position8>
       <Position9>
         <Filename Value="uOSRExternalPumpBrowser.pas"/>
-        <Caret Line="503" Column="11" TopLine="499"/>
+        <Caret Line="982" Column="68" TopLine="963"/>
       </Position9>
       <Position10>
         <Filename Value="uOSRExternalPumpBrowser.pas"/>
-        <Caret Line="201" Column="11" TopLine="166"/>
+        <Caret Line="307" Column="39" TopLine="301"/>
       </Position10>
       <Position11>
         <Filename Value="uOSRExternalPumpBrowser.pas"/>
-        <Caret Line="982" Column="68" TopLine="963"/>
+        <Caret Line="82" Column="44" TopLine="77"/>
       </Position11>
       <Position12>
         <Filename Value="uOSRExternalPumpBrowser.pas"/>
-        <Caret Line="307" Column="39" TopLine="301"/>
+        <Caret Line="957" TopLine="939"/>
       </Position12>
       <Position13>
         <Filename Value="uOSRExternalPumpBrowser.pas"/>
-        <Caret Line="82" Column="44" TopLine="77"/>
+        <Caret Line="958" TopLine="939"/>
       </Position13>
       <Position14>
         <Filename Value="uOSRExternalPumpBrowser.pas"/>
@@ -122,63 +122,63 @@
       </Position15>
       <Position16>
         <Filename Value="uOSRExternalPumpBrowser.pas"/>
-        <Caret Line="957" TopLine="939"/>
+        <Caret Line="960" TopLine="939"/>
       </Position16>
       <Position17>
-        <Filename Value="uOSRExternalPumpBrowser.pas"/>
-        <Caret Line="958" TopLine="939"/>
+        <Filename Value="OSRExternalPumpBrowser.lpr"/>
+        <Caret Line="61" Column="63" TopLine="41"/>
       </Position17>
       <Position18>
         <Filename Value="uOSRExternalPumpBrowser.pas"/>
-        <Caret Line="960" TopLine="939"/>
+        <Caret Line="169" Column="11" TopLine="153"/>
       </Position18>
       <Position19>
-        <Filename Value="OSRExternalPumpBrowser.lpr"/>
-        <Caret Line="61" Column="63" TopLine="41"/>
+        <Filename Value="uOSRExternalPumpBrowser.pas"/>
+        <Caret Line="198" TopLine="176"/>
       </Position19>
       <Position20>
         <Filename Value="uOSRExternalPumpBrowser.pas"/>
-        <Caret Line="169" Column="11" TopLine="153"/>
+        <Caret Line="170" Column="82" TopLine="148"/>
       </Position20>
       <Position21>
         <Filename Value="uOSRExternalPumpBrowser.pas"/>
-        <Caret Line="198" TopLine="176"/>
+        <Caret Line="217" Column="51" TopLine="196"/>
       </Position21>
       <Position22>
         <Filename Value="uOSRExternalPumpBrowser.pas"/>
-        <Caret Line="170" Column="82" TopLine="148"/>
+        <Caret Line="105" Column="30" TopLine="71"/>
       </Position22>
       <Position23>
         <Filename Value="uOSRExternalPumpBrowser.pas"/>
-        <Caret Line="217" Column="51" TopLine="196"/>
+        <Caret Line="282" TopLine="278"/>
       </Position23>
       <Position24>
         <Filename Value="uOSRExternalPumpBrowser.pas"/>
-        <Caret Line="105" Column="30" TopLine="71"/>
+        <Caret Line="945" Column="91" TopLine="926"/>
       </Position24>
       <Position25>
         <Filename Value="uOSRExternalPumpBrowser.pas"/>
-        <Caret Line="282" TopLine="278"/>
+        <Caret Line="944" Column="91" TopLine="925"/>
       </Position25>
       <Position26>
         <Filename Value="uOSRExternalPumpBrowser.pas"/>
-        <Caret Line="945" Column="91" TopLine="926"/>
+        <Caret Line="943" Column="110" TopLine="925"/>
       </Position26>
       <Position27>
         <Filename Value="uOSRExternalPumpBrowser.pas"/>
-        <Caret Line="944" Column="91" TopLine="925"/>
+        <Caret Line="7" Column="109"/>
       </Position27>
       <Position28>
         <Filename Value="uOSRExternalPumpBrowser.pas"/>
-        <Caret Line="943" Column="110" TopLine="925"/>
+        <Caret Line="168" Column="26" TopLine="145"/>
       </Position28>
       <Position29>
         <Filename Value="uOSRExternalPumpBrowser.pas"/>
-        <Caret Line="7" Column="109"/>
+        <Caret Line="337" Column="52" TopLine="312"/>
       </Position29>
       <Position30>
         <Filename Value="uOSRExternalPumpBrowser.pas"/>
-        <Caret Line="168" Column="26" TopLine="145"/>
+        <Caret Line="94" Column="15" TopLine="81"/>
       </Position30>
     </JumpHistory>
     <RunParams>

demos/Lazarus/OSRExternalPumpBrowser/uOSRExternalPumpBrowser.pas

@@ -398,7 +398,8 @@ var
   TempWidth, TempHeight : integer;
   TempBufferBits : Pointer;
   TempForcedResize : boolean;
-  TempBitmap : TBitmap;
+  TempBitmap : TBitmap;           
+  TempSrcRect : TRect;
 begin
   try
     FResizeCS.Acquire;
@@ -478,7 +479,13 @@ begin
             TempBitmap.EndUpdate;
 
             if FShowPopup and (FPopUpBitmap <> nil) then
-              Panel1.BufferDraw(FPopUpRect.Left, FPopUpRect.Top, FPopUpBitmap);
+              begin
+                TempSrcRect := Rect(0, 0,
+                                    min(FPopUpRect.Right  - FPopUpRect.Left, FPopUpBitmap.Width),
+                                    min(FPopUpRect.Bottom - FPopUpRect.Top,  FPopUpBitmap.Height));
+
+                Panel1.BufferDraw(FPopUpBitmap, TempSrcRect, FPopUpRect);
+              end;
           end;
 
         Panel1.EndBufferDraw;

demos/Lazarus/SimpleOSRBrowser/SimpleOSRBrowser.lps

@@ -38,8 +38,8 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <IsVisibleTab Value="True"/>
-        <TopLine Value="168"/>
-        <CursorPos X="26" Y="171"/>
+        <TopLine Value="359"/>
+        <CursorPos X="23" Y="375"/>
         <UsageCount Value="42"/>
         <Bookmarks Count="1">
           <Item0 X="40" Y="262" ID="4"/>
@@ -229,7 +229,7 @@
         <UsageCount Value="10"/>
       </Unit26>
     </Units>
-    <JumpHistory Count="15" HistoryIndex="14">
+    <JumpHistory Count="17" HistoryIndex="16">
       <Position1>
         <Filename Value="usimplelazosrbrowser.pas"/>
         <Caret Line="204" Column="63" TopLine="19"/>
@@ -290,6 +290,14 @@
         <Filename Value="usimplelazosrbrowser.pas"/>
         <Caret Line="65" TopLine="59"/>
       </Position15>
+      <Position16>
+        <Filename Value="usimplelazosrbrowser.pas"/>
+        <Caret Line="197" Column="68" TopLine="168"/>
+      </Position16>
+      <Position17>
+        <Filename Value="usimplelazosrbrowser.pas"/>
+        <Caret Line="91" Column="15" TopLine="85"/>
+      </Position17>
     </JumpHistory>
     <RunParams>
       <FormatVersion Value="2"/>

demos/Lazarus/SimpleOSRBrowser/usimplelazosrbrowser.pas

@@ -371,7 +371,8 @@ var
   TempWidth, TempHeight : integer;
   TempBufferBits : Pointer;
   TempForcedResize : boolean;
-  TempBitmap : TBitmap;
+  TempBitmap : TBitmap;     
+  TempSrcRect : TRect;
 begin
   try
     FResizeCS.Acquire;
@@ -451,7 +452,13 @@ begin
             TempBitmap.EndUpdate;
 
             if FShowPopup and (FPopUpBitmap <> nil) then
-              Panel1.BufferDraw(FPopUpRect.Left, FPopUpRect.Top, FPopUpBitmap);
+              begin
+                TempSrcRect := Rect(0, 0,
+                                    min(FPopUpRect.Right  - FPopUpRect.Left, FPopUpBitmap.Width),
+                                    min(FPopUpRect.Bottom - FPopUpRect.Top,  FPopUpBitmap.Height));
+
+                Panel1.BufferDraw(FPopUpBitmap, TempSrcRect, FPopUpRect);
+              end;
           end;
 
         Panel1.EndBufferDraw;