From bd996b85629481c4f7cac9b7792d0b9cdf3a411d Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Tue, 15 Apr 2003 08:30:28 +0000
Subject: [PATCH] No more weird border

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2460 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/BgImage/BgImage.cpp |  24 ++++++++++--------------
 Plugins/BgImage.dll         | Bin 4608 -> 4608 bytes
 TODO.txt                    |   2 --
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/Contrib/BgImage/BgImage.cpp b/Contrib/BgImage/BgImage.cpp
index 98e27930..8a450319 100644
--- a/Contrib/BgImage/BgImage.cpp
+++ b/Contrib/BgImage/BgImage.cpp
@@ -1,7 +1,3 @@
-/* I modified the window styles to eliminate the annoying title bar.
-   8th February 2003 Ximon Eighteen aka Sunjammer */
-
-
 #include <Windows.h>
 #include <Mmsystem.h>
 #include "../exdll/exdll.h"
@@ -26,8 +22,6 @@ extern "C" void __declspec(dllexport) Init(HWND hwndParent, int string_size, cha
     return;
   }
 
-  SetImage(hwndParent, string_size, variables, stacktop);
-
   WNDCLASSEX wc = {
     sizeof(WNDCLASSEX),
     CS_VREDRAW|CS_HREDRAW,
@@ -48,14 +42,14 @@ extern "C" void __declspec(dllexport) Init(HWND hwndParent, int string_size, cha
   }
 
   hWndImage = CreateWindowEx(
-    WS_EX_TOOLWINDOW|WS_EX_LEFT|WS_EX_LTRREADING|WS_EX_RIGHTSCROLLBAR,
+    WS_EX_TOOLWINDOW,
     "NSISBGImage",
     0,
-    WS_POPUPWINDOW|WS_VISIBLE|WS_CLIPSIBLINGS|WS_OVERLAPPED,
-    (GetSystemMetrics(SM_CXSCREEN)-x)/2,
-    (GetSystemMetrics(SM_CYSCREEN)-y)/2,
-    x,
-    y,
+    WS_CLIPSIBLINGS|WS_POPUP,
+    0,
+    0,
+    0,
+    0,
     0,
     0,
     g_hInstance,
@@ -66,7 +60,9 @@ extern "C" void __declspec(dllexport) Init(HWND hwndParent, int string_size, cha
     return;
   }
 
-  SetWindowLong(hWndImage, GWL_STYLE, WS_VISIBLE);
+  ShowWindow(hWndImage, SW_SHOW);
+
+  SetImage(hwndParent, string_size, variables, stacktop);
 
   oldProc = (void *)SetWindowLong(hwndParent, GWL_WNDPROC, (long)WndProc);
 }
@@ -184,7 +180,7 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       SetWindowPos(hWndImage, hWndParent, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE);
     }
     return CallWindowProc(
-      (long (__stdcall *)(struct HWND__ *,unsigned int,unsigned int,long))oldProc,
+      (long (__stdcall *)(HWND,unsigned int,unsigned int,long))oldProc,
       hwnd,
       message,
       wParam,
diff --git a/Plugins/BgImage.dll b/Plugins/BgImage.dll
index c9023ec0900074bc0c5d5d40b77db3df075698ca..26f63aa32f88b66d9c6cf287bd3d37d72d5da9e5 100644
GIT binary patch
delta 704
zcmbV}QA<=o6vt=Qc30NjxNR<JA*o4XrOcVR8&;y0Z6&5{7`sZSg{|C`N^|#SlHw)v
zVZjG=A|mY}?I9y5+83dslF%N4%p#<ogaXa#B@qSbcGkW@1HU=v%>SG-hZ!Ts$myR=
z`aC@}@FjzG4Xj?J<MNV4m18uQ9+B^9JGI5jEt9k$IC>9=qC2!gMwEqKLdabMy{CO{
zq6DUV(+p3hd>@n0#Oh{c<%VtDFZN)9Kc+9mx>jQPn(5IpiPF^jQnzcVs4V6OOmCt`
zV0~#=c|8!+478@_Jf<F)9PLM0cWDI8d=2)lT`Xv}`b|$O%BG%b>bN^iJ$XJIt9o85
z)y-=dnVwUq+eU|R;s&|VT1rdfC#+WLE=rWG->D^LGd+c}$<{+#<#(Hx`emlQm>!o6
z_B?t_#?U`3-`IE4n)s64X_1Bn1|5ao{n><6Av=*)q!Z~wZX-{!2&qS#h9n~^7=J}(
z<jIuH(r^s_cXed@pru-CX%B`ko@;3*<P0fm3!ROI{>8p42jxOanY)f24MnRvBGJ%=
z%22c|+!&F&oKgAEc|Y;PGU&>3dEEF=3L$gIzId;z+tNLbC!1Ir%VxQ(iq*0(i?B|1
zgAK6}7H1#WEc?Nh*&mh!3T%N4$OkX@paT4G8X6%CZO{P*+=4qW29MwwOu!7x!B6-N
zt6<|!p22tUJYK+6UcxJQkk|9e{2G^hoImI9_$QUm^Itq&<cqzcNE{MD(J5l$rWg?q
h#A7ib-imKxQ7j9q>Qc9=nJQDgYH|FPQbGrq<1ay6(h~px

delta 744
zcmbV~-%C_M6vt=Q9~<j#+*U23v<zV>rRK-IwN!3KS!yLK%4(5HKX$u{zt`I$Np6_1
zqLDg6R1(MrVNy{0lo3R2F1<urm?c5tiza1Y4+iG#T>KAu_{`xu-*e8K877z+%<P?t
z%UAq;(`oo|-=8ZuDw<5P7{(495aT$2rAUEk47<YjDUvjc>Lf^-e}fRxwG>^Gbj|9X
zn*})(1fwG=#q!=0kg>dvaS%MQyr~y<B#E5(E$z><A;sOL{qCw*?$TEDRCPO&e4Q^f
zvzh|V!r3y9t{82)b85lyfC_=qmFuw9VEt28f}w9`y&7M3dkkq9Yf?ohG~g*wgK(&x
z+6d(b#=^Z|S7|mCL7Xdez(A)LGP;#ga3LRh{&MS+sxe>9imt8GC&PnqN%1v47uQD8
z6B4l938`x{smAbnYOYWcJFr_kOH}Ylv6$$>`C_+uCq635%`RLnZke<2!N_Z~)zois
zD!Drlas$~wJ#ZE10qy}$GY~otF&$VBtb+ayOp4;9WD&Fs{&%%sOeEQpEAVk|OG&H0
z#anmE+tOTp!H>jj(h;%W+HC7Lm8cDYvg-Pa4FM!Zti#3+5M{Ou+cCTGFbLT<AXF3S
zw6&Ysqs9)|L<lJ$m86=qk`8i%2y&MUkr6UVCdg+pLl(&@vCuT?pnIrH57T^FL@TL}
zUZ!pI8ttJ2^bQTvhx7@3OW)Bi^c(#_muMWbvviipcCmddhZV6>c7|0kFKc9NEW~cI
z2P|@kMcF+2$q+a5&3qd#<dysquj76m;*a<!kMR$Dn$Peh{+Dl*x5^HAuk4af$i?zG
N*(W#1ktUN1{{z+p;`aam

diff --git a/TODO.txt b/TODO.txt
index 2a0cb472..959ed0bf 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -28,8 +28,6 @@ EXAMPLES
 
 OTHER PLUGINS
 
-* BgImage - SetImage /RESIZETOFIT doesn't work
-
 * nsExec - live output
 
 -- Before NSIS 2 Final --