diff options
| -rw-r--r-- | libs/mTextControl/src/textcontrol.cpp | 24 | ||||
| -rw-r--r-- | plugins/ExternalAPI/m_text.h | 5 | ||||
| -rw-r--r-- | plugins/NewStory/src/options.cpp | 15 |
3 files changed, 39 insertions, 5 deletions
diff --git a/libs/mTextControl/src/textcontrol.cpp b/libs/mTextControl/src/textcontrol.cpp index 5a871d42e5..2391ecc1ac 100644 --- a/libs/mTextControl/src/textcontrol.cpp +++ b/libs/mTextControl/src/textcontrol.cpp @@ -24,6 +24,7 @@ struct TextControlData HANDLE htu; wchar_t *text; struct TextObject *mtext; + COLORREF clBack = -1; }; /// Paint //////////////////////////////////// @@ -32,17 +33,25 @@ static LRESULT MTextControl_OnPaint(HWND hwnd) { PAINTSTRUCT ps; HDC hdc = BeginPaint(hwnd, &ps); + + // Find the text to draw + TextControlData *data = (TextControlData *)GetWindowLongPtr(hwnd, GWLP_USERDATA); + + SetTextColor(hdc, RGB(0, 0, 0)); + SetBkMode(hdc, TRANSPARENT); { RECT rc; GetClientRect(hwnd, &rc); + + if (data->clBack != -1) { + HBRUSH hbr = CreateSolidBrush(data->clBack); + FillRect(hdc, &rc, hbr); + DeleteObject(hbr); + } + FrameRect(hdc, &rc, (HBRUSH)GetStockObject(BLACK_BRUSH)); } - SetTextColor(hdc, RGB(0, 0, 0)); - SetBkMode(hdc, TRANSPARENT); - - // Find the text to draw - TextControlData *data = (TextControlData *)GetWindowLongPtr(hwnd, GWLP_USERDATA); if (data->mtext) { HFONT hfntSave = nullptr; HFONT hfnt = (HFONT)SendMessage(hwnd, WM_GETFONT, 0, 0); @@ -109,6 +118,11 @@ static LRESULT CALLBACK MTextControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, InvalidateRect(hwnd, nullptr, TRUE); return TRUE; + case MTM_SETBKCOLOR: + data->clBack = wParam; + InvalidateRect(hwnd, nullptr, TRUE); + return TRUE; + case MTM_UPDATEEX: if (data->text) { delete[] data->text; diff --git a/plugins/ExternalAPI/m_text.h b/plugins/ExternalAPI/m_text.h index d2165802ac..9bb349d8a8 100644 --- a/plugins/ExternalAPI/m_text.h +++ b/plugins/ExternalAPI/m_text.h @@ -12,6 +12,11 @@ // lParam = (void*)text
#define MTM_UPDATEEX (WM_USER+2)
+// sets background color for a control
+// wParam = (COLORREF)clBack
+// lParam = 0 (ignored)
+#define MTM_SETBKCOLOR (WM_USER+3)
+
typedef struct TextObject *HText;
#ifdef MTEXTCONTROL_EXPORTS
diff --git a/plugins/NewStory/src/options.cpp b/plugins/NewStory/src/options.cpp index cf73b767e2..98cb365020 100644 --- a/plugins/NewStory/src/options.cpp +++ b/plugins/NewStory/src/options.cpp @@ -78,6 +78,16 @@ class CTemplateOptsDlg : public CBaseOptsDlg CCtrlMButton btnDiscard, bthVarHelp, btnReset; CCtrlTreeView m_tree; + UI_MESSAGE_MAP(CTemplateOptsDlg, CBaseOptsDlg); + UI_MESSAGE(UM_REDRAWLISTH, OnColorChanged); + UI_MESSAGE_MAP_END(); + + LRESULT OnColorChanged(UINT, WPARAM, LPARAM) + { + gpreview.SendMsg(MTM_SETBKCOLOR, g_colorTable[COLOR_BACK].cl, 0); + return 0; + } + public: CTemplateOptsDlg() : CBaseOptsDlg(IDD_OPT_TEMPLATES), @@ -148,6 +158,9 @@ public: m_tree.SelectItem(hFirst); m_tree.EnsureVisible(hFirst); + + WindowList_Add(g_hNewstoryWindows, m_hwnd); + OnColorChanged(0, 0, 0); return true; } @@ -170,6 +183,8 @@ public: void OnDestroy() override { + WindowList_Remove(g_hNewstoryWindows, m_hwnd); + for (auto &it : templates) replaceStrW(it.tmpValue, nullptr); } |