BrandingText now automatically resizes for all languages in the MUI

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2082 212acab6-be3b-0410-9dea-997c60f758d6

Contrib/Modern UI/System.nsh

@@ -335,6 +335,14 @@
   GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1039
   SetStaticBkColor ${MUI_TEMP1} "${MUI_BGCOLOR}"
 
+  GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1028
+  SetStaticBkColor ${MUI_TEMP1} -1
+  GetWindowText ${MUI_TEMP2} ${MUI_TEMP1}
+  #ShowWindow ${MUI_TEMP1} ${SW_HIDE}
+  GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1256
+  SetStaticBkColor ${MUI_TEMP1} -1
+  SendMessage ${MUI_TEMP1} ${WM_SETTEXT} ${NSIS_MAX_STRLEN} "STR:${MUI_TEMP2}"
+
   Pop ${MUI_TEMP2}
   Pop ${MUI_TEMP1}
   

Source/exehead/Ui.c

@@ -127,6 +127,11 @@ static BOOL NSISCALL SetDlgItemTextFromLang_(HWND dlg, int id, int lid) {
 #define HandleStaticBkColor() _HandleStaticBkColor(uMsg, wParam, lParam)
 static BOOL NSISCALL _HandleStaticBkColor(UINT uMsg, WPARAM wParam, LPARAM lParam) {
   if (uMsg == WM_CTLCOLORSTATIC) {
+    BOOL brush = (BOOL)GetWindowLong((HWND)lParam, GWL_USERDATA);
+    if (brush == -1) {
+      SetBkColor((HDC)wParam, GetSysColor(COLOR_BTNFACE));
+      return (BOOL)GetStockObject(NULL_BRUSH);
+    }
     SetBkMode((HDC)wParam, TRANSPARENT);
     return (BOOL)GetWindowLong((HWND)lParam, GWL_USERDATA);
   }

Source/exehead/exec.c

@@ -762,12 +762,19 @@ static int NSISCALL ExecuteEntry(entry *entry_)
         )
       );
     return 0;
+    case EW_GETWINTEXT:
+      my_GetWindowText(
+        (HWND)process_string_fromparm_toint(1),
+        var0,
+        NSIS_MAX_STRLEN
+      );
+    return 0;
     case EW_SETSTATICBKCOLOR:
       DeleteObject(
         (HGDIOBJ)SetWindowLong(
           (HWND)process_string_fromparm_toint(0),
           GWL_USERDATA,
-          (LONG)CreateSolidBrush(parm1)
+          parm1==-1?parm1:(LONG)CreateSolidBrush(parm1)
         )
       );
     return 0;

Source/exehead/fileform.h

@@ -93,8 +93,9 @@ enum
 #endif
 
 #ifdef NSIS_CONFIG_ENHANCEDUI_SUPPORT
-  EW_GETDLGITEM,        // GetDlgItem:        3 [outputvar, dialog, item_id]
-  EW_SETSTATICBKCOLOR,  // SerStaticBkColor:  3 [hwnd, color]
+  EW_GETDLGITEM,        // GetDlgItem:        3: [outputvar, dialog, item_id]
+  EW_GETWINTEXT,        // GetWindowText:     2: [outputvar, hwnd]
+  EW_SETSTATICBKCOLOR,  // SerStaticBkColor:  3: [hwnd, color]
   EW_SETBRANDINGIMAGE,  // SetBrandingImage:  1: [Bitmap file]
   EW_CREATEFONT,        // CreateFont:        5: [handle output, face name, height, weight, flags]
   EW_SHOWWINDOW,        // ShowWindow:        2: [hwnd, show state]

Source/script.cpp

@@ -2651,6 +2651,13 @@ int CEXEBuild::doCommand(int which_token, LineParser &line, FILE *fp, const char
       ent.offsets[2]=add_string(line.gettoken_str(3));
       SCRIPT_MSG("GetDlgItem: output=%s dialog=%s item=%s\n",line.gettoken_str(1),line.gettoken_str(2),line.gettoken_str(3));
     return add_entry(&ent);
+    case TOK_GETWINTEXT:
+      ent.which=EW_GETWINTEXT;
+      ent.offsets[0]=line.gettoken_enum(1,usrvars);
+      if (ent.offsets[0]<0) PRINTHELP();
+      ent.offsets[1]=add_string(line.gettoken_str(2));
+      SCRIPT_MSG("GetWindowText: output=%s hwnd=%s\n",line.gettoken_str(1),line.gettoken_str(2));
+    return add_entry(&ent);
     case TOK_SETSTATICBKCOLOR:
       ent.which=EW_SETSTATICBKCOLOR;
       ent.offsets[0]=add_string(line.gettoken_str(1));

Source/tokens.cpp

@@ -76,6 +76,7 @@ static tokenType tokenlist[TOK__LAST] =
 {TOK_GETDLGITEM,"GetDlgItem",3,0,"$(user_var: handle output) dialog item_id"},
 {TOK_GETFULLPATHNAME,"GetFullPathName",2,1,"[/SHORT] $(user_var: result) path_or_file"},
 {TOK_GETTEMPFILENAME,"GetTempFileName",1,0,"$(user_var: name output)"},
+{TOK_GETWINTEXT,"GetWindowText",2,0,"$(user_var: handle output) hwnd"},
 {TOK_HIDEWINDOW,"HideWindow",0,0,""},
 {TOK_ICON,"Icon",1,0,"local_icon.ico"},
 {TOK_IFERRORS,"IfErrors",1,1,"label_to_goto_if_errors [label_to_goto_if_no_errors]"},

Source/tokens.h

@@ -172,6 +172,7 @@ enum
   TOK_SENDMESSAGE,
   TOK_ISWINDOW,
   TOK_GETDLGITEM,
+  TOK_GETWINTEXT,
   TOK_SETSTATICBKCOLOR,
   TOK_SETWINDOWLONG,
   TOK_FINDFIRST,