From 91460d1ca83964d21abe84399b46d3f1a92d7b10 Mon Sep 17 00:00:00 2001 From: Jonas Kümmerlin Date: Sun, 31 May 2020 20:54:48 +0200 Subject: label: implement naming style with underscores --- alf/alf.h | 4 ++-- alf/alfgroupbox.cpp | 2 +- alf/alflabel.cpp | 20 ++++++++++---------- widgetfactory.cpp | 20 ++++++++++---------- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/alf/alf.h b/alf/alf.h index 044fa9e..e8a8864 100644 --- a/alf/alf.h +++ b/alf/alf.h @@ -451,10 +451,10 @@ HWND ALF_AddLabel(HWND win, WORD id, int x, int y, const TCHAR *text); DWORD -ALF_LabelStyle(HWND hwndLabel); +ALF_Label_Style(HWND hwndLabel); void -ALF_LabelSetStyle(HWND hwndLabel, DWORD style); +ALF_Label_SetStyle(HWND hwndLabel, DWORD style); // edit diff --git a/alf/alfgroupbox.cpp b/alf/alfgroupbox.cpp index 40ca6cd..3aed7d1 100644 --- a/alf/alfgroupbox.cpp +++ b/alf/alfgroupbox.cpp @@ -32,7 +32,7 @@ ALF_GroupBox_IntializePriv(ALFGroupBoxPriv *priv, HWND window, const TCHAR *text priv->layout.preApplyLayoutToContainerWidget = ALF_GroupBox_PreContainerWidgetApplyPos; priv->label = ALF_AddLabel(window, (WORD)-1, -1, -1, text); - ALF_LabelSetStyle(priv->label, ALF_LABEL_ALIGN_LEFT | ALF_LABEL_ALIGN_TOP); + ALF_Label_SetStyle(priv->label, ALF_LABEL_ALIGN_LEFT | ALF_LABEL_ALIGN_TOP); ALF_GroupBox_HandleThemeChange(priv, window); } diff --git a/alf/alflabel.cpp b/alf/alflabel.cpp index a5165af..05bd35e 100644 --- a/alf/alflabel.cpp +++ b/alf/alflabel.cpp @@ -11,7 +11,7 @@ typedef struct { } ALFLabelPriv; static int -ALF__LabelTopPadding(HWND hwnd, ALFLabelPriv *priv) +ALF_Label_TopPadding(HWND hwnd, ALFLabelPriv *priv) { (void)hwnd; @@ -23,7 +23,7 @@ ALF__LabelTopPadding(HWND hwnd, ALFLabelPriv *priv) } static int -ALF__LabelLeftPadding(HWND hwnd, HDC hdc, ALFLabelPriv *priv) +ALF_Label_LeftPadding(HWND hwnd, HDC hdc, ALFLabelPriv *priv) { (void)hwnd; @@ -85,7 +85,7 @@ ALF_Label_Paint(HWND hwnd, ALFLabelPriv *priv, HDC hdc, RECT *r) break; case ALF_LABEL_ALIGN_LEFT_LIKE_EDIT: format |= DT_LEFT; - rcTarget.left = ALF__LabelLeftPadding(hwnd, hdc, priv); + rcTarget.left = ALF_Label_LeftPadding(hwnd, hdc, priv); rcTarget.right = rcTarget.left + rcText.right - rcText.left; break; case ALF_LABEL_ALIGN_HCENTER: @@ -107,7 +107,7 @@ ALF_Label_Paint(HWND hwnd, ALFLabelPriv *priv, HDC hdc, RECT *r) break; case ALF_LABEL_ALIGN_TOP_LIKE_EDIT: format |= DT_TOP; - rcTarget.top = ALF__LabelTopPadding(hwnd, priv); + rcTarget.top = ALF_Label_TopPadding(hwnd, priv); rcTarget.bottom = rcTarget.top + rcText.bottom - rcText.top; break; case ALF_LABEL_ALIGN_BOTTOM: @@ -155,11 +155,11 @@ ALF_Label_CalculateSize(HWND hwnd, ALFLabelPriv *priv, SIZE *pSize) int cx = r.right - r.left; if ((priv->style & ALF_LABEL_HALIGN_MASK) == ALF_LABEL_ALIGN_LEFT_LIKE_EDIT) - cx += ALF__LabelLeftPadding(hwnd, hdcLabel, priv); + cx += ALF_Label_LeftPadding(hwnd, hdcLabel, priv); int cy = r.bottom - r.top; if ((priv->style & ALF_LABEL_VALIGN_MASK) == ALF_LABEL_ALIGN_TOP_LIKE_EDIT) - cy += ALF__LabelTopPadding(hwnd, priv); + cy += ALF_Label_TopPadding(hwnd, priv); if (pSize->cx < cx) @@ -174,7 +174,7 @@ ALF_Label_CalculateSize(HWND hwnd, ALFLabelPriv *priv, SIZE *pSize) } static LRESULT CALLBACK -ALF__LabelWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +ALF_Label_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { ALFLabelPriv *priv = (ALFLabelPriv*)GetWindowLongPtr(hwnd, 0); if (!priv) @@ -297,7 +297,7 @@ ALF_AddLabel(HWND win, WORD id, int x, int y, const TCHAR *text) 0, 0, 100, 100, win, (HMENU)(ULONG_PTR)id, - ALF__LabelWindowProc, + ALF_Label_WindowProc, NULL); ALFLabelPriv *priv = ALF_New(ALFLabelPriv, 1); @@ -313,13 +313,13 @@ ALF_AddLabel(HWND win, WORD id, int x, int y, const TCHAR *text) } DWORD -ALF_LabelStyle(HWND hwndLabel) +ALF_Label_Style(HWND hwndLabel) { return (DWORD)SendMessage(hwndLabel, ALF_WM_LBL_GETSTYLE, 0, 0); } void -ALF_LabelSetStyle(HWND hwndLabel, DWORD style) +ALF_Label_SetStyle(HWND hwndLabel, DWORD style) { SendMessage(hwndLabel, ALF_WM_LBL_SETSTYLE, 0, (LPARAM)style); } diff --git a/widgetfactory.cpp b/widgetfactory.cpp index acb9358..d023e39 100644 --- a/widgetfactory.cpp +++ b/widgetfactory.cpp @@ -396,23 +396,23 @@ labelPanelAttach(void *closure, HWND panel) g = ALF_AddGroupBox(panel, (WORD)-1, 0, 0, TEXT("Horizontal and Vertical")); l = ALF_AddLabel(g, (WORD)-1, 0, 0, TEXT("Left\r\nTop")); - ALF_LabelSetStyle(l, ALF_LABEL_ALIGN_LEFT | ALF_LABEL_ALIGN_TOP); + ALF_Label_SetStyle(l, ALF_LABEL_ALIGN_LEFT | ALF_LABEL_ALIGN_TOP); l = ALF_AddLabel(g, (WORD)-1, 0, 2, TEXT("Left\r\nCenter")); - ALF_LabelSetStyle(l, ALF_LABEL_ALIGN_LEFT | ALF_LABEL_ALIGN_VCENTER); + ALF_Label_SetStyle(l, ALF_LABEL_ALIGN_LEFT | ALF_LABEL_ALIGN_VCENTER); l = ALF_AddLabel(g, (WORD)-1, 0, 4, TEXT("Left\r\nBottom")); - ALF_LabelSetStyle(l, ALF_LABEL_ALIGN_LEFT | ALF_LABEL_ALIGN_BOTTOM); + ALF_Label_SetStyle(l, ALF_LABEL_ALIGN_LEFT | ALF_LABEL_ALIGN_BOTTOM); l = ALF_AddLabel(g, (WORD)-1, 2, 0, TEXT("Center\r\nTop")); - ALF_LabelSetStyle(l, ALF_LABEL_ALIGN_HCENTER | ALF_LABEL_ALIGN_TOP); + ALF_Label_SetStyle(l, ALF_LABEL_ALIGN_HCENTER | ALF_LABEL_ALIGN_TOP); l = ALF_AddLabel(g, (WORD)-1, 2, 2, TEXT("Center\r\nCenter")); - ALF_LabelSetStyle(l, ALF_LABEL_ALIGN_HCENTER | ALF_LABEL_ALIGN_VCENTER); + ALF_Label_SetStyle(l, ALF_LABEL_ALIGN_HCENTER | ALF_LABEL_ALIGN_VCENTER); l = ALF_AddLabel(g, (WORD)-1, 2, 4, TEXT("Center\r\nBottom")); - ALF_LabelSetStyle(l, ALF_LABEL_ALIGN_HCENTER | ALF_LABEL_ALIGN_BOTTOM); + ALF_Label_SetStyle(l, ALF_LABEL_ALIGN_HCENTER | ALF_LABEL_ALIGN_BOTTOM); l = ALF_AddLabel(g, (WORD)-1, 4, 0, TEXT("Right\r\nTop")); - ALF_LabelSetStyle(l, ALF_LABEL_ALIGN_RIGHT | ALF_LABEL_ALIGN_TOP); + ALF_Label_SetStyle(l, ALF_LABEL_ALIGN_RIGHT | ALF_LABEL_ALIGN_TOP); l = ALF_AddLabel(g, (WORD)-1, 4, 2, TEXT("Right\r\nCenter")); - ALF_LabelSetStyle(l, ALF_LABEL_ALIGN_RIGHT | ALF_LABEL_ALIGN_VCENTER); + ALF_Label_SetStyle(l, ALF_LABEL_ALIGN_RIGHT | ALF_LABEL_ALIGN_VCENTER); l = ALF_AddLabel(g, (WORD)-1, 4, 4, TEXT("Right\r\nBottom")); - ALF_LabelSetStyle(l, ALF_LABEL_ALIGN_RIGHT | ALF_LABEL_ALIGN_BOTTOM); + ALF_Label_SetStyle(l, ALF_LABEL_ALIGN_RIGHT | ALF_LABEL_ALIGN_BOTTOM); makeSeparator(g, 0, 1); makeSeparator(g, 0, 3); @@ -440,7 +440,7 @@ labelPanelAttach(void *closure, HWND panel) ALF_AddLabel(g, (WORD)-1, 1, 2, TEXT("Bas&eline")); ALF_AddEdit(g, (WORD)-1, 3, 2, TEXT("Baseline Comparison")); l = ALF_AddLabel(g, (WORD)-1, 3, 4, TEXT("Left Comparison")); - ALF_LabelSetStyle(l, ALF_LABEL_ALIGN_LEFT_LIKE_EDIT | ALF_LABEL_ALIGN_TOP); + ALF_Label_SetStyle(l, ALF_LABEL_ALIGN_LEFT_LIKE_EDIT | ALF_LABEL_ALIGN_TOP); g = ALF_AddGroupBox(panel, (WORD)-1, 0, 2, TEXT("Other Stuff")); l = ALF_AddLabel(g, (WORD)-1, 0, 0, TEXT("Colored")); -- cgit v1.2.3