inetcpl: Don't pad group box labels with spaces.
Francois Gouget
fgouget at free.fr
Wed Dec 28 17:12:21 CST 2011
---
The Windows User Experience Interaction Guidelines don't say anything
about this. However adding spaces to the label to affect the layout or
maybe to compensate some look and feel defect in the group box look and
feel feels wrong to me. Our dialogs are also pretty inconsistent in
this regard. So if there's no objection I'll send more patches removing
these spaces.
dlls/inetcpl.cpl/inetcpl.rc | 6 +++---
dlls/inetcpl.cpl/security.c | 9 ++-------
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/dlls/inetcpl.cpl/inetcpl.rc b/dlls/inetcpl.cpl/inetcpl.rc
index 8ca7779..49ef5e6 100644
--- a/dlls/inetcpl.cpl/inetcpl.rc
+++ b/dlls/inetcpl.cpl/inetcpl.rc
@@ -43,14 +43,14 @@ FONT 8, "MS Shell Dlg"
CAPTION "General"
BEGIN
- GROUPBOX " Home page ", IDC_STATIC, 4, 4, 312, 56
+ GROUPBOX "Home page", IDC_STATIC, 4, 4, 312, 56
LTEXT "You can choose the address that will be used as your home page.",
IDC_STATIC, 10, 14, 300, 10
EDITTEXT IDC_HOME_EDIT, 10, 26, 300, 12, WS_VISIBLE | ES_AUTOHSCROLL
PUSHBUTTON "&Current page", IDC_HOME_CURRENT, 58, 42, 80, 14
PUSHBUTTON "&Default page", IDC_HOME_DEFAULT, 144, 42, 80, 14
PUSHBUTTON "&Blank page", IDC_HOME_BLANK, 230, 42, 80, 14
- GROUPBOX " Browsing history ", IDC_STATIC, 4, 66, 312, 42
+ GROUPBOX "Browsing history", IDC_STATIC, 4, 66, 312, 42
LTEXT "You can delete cached pages, cookies and other data.",
IDC_STATIC, 10, 76, 300, 10
PUSHBUTTON "Delete &files...", IDC_HISTORY_DELETE, 144, 90, 80, 14
@@ -105,7 +105,7 @@ FONT 8, "MS Shell Dlg"
CAPTION "Content"
BEGIN
- GROUPBOX " Certificates ", IDC_STATIC, 4, 4, 312, 50
+ GROUPBOX "Certificates", IDC_STATIC, 4, 4, 312, 50
LTEXT "Certificates are used for your personal identification and to identify certificate authorities and publishers.",
IDC_STATIC, 58, 14, 252, 18
PUSHBUTTON "Certificates...", IDC_CERT, 146, 34, 80, 14
diff --git a/dlls/inetcpl.cpl/security.c b/dlls/inetcpl.cpl/security.c
index 1187185..8f46b79 100644
--- a/dlls/inetcpl.cpl/security.c
+++ b/dlls/inetcpl.cpl/security.c
@@ -59,7 +59,6 @@ typedef struct secdlg_data_s {
#define NUM_TRACKBAR_POS 5
-static WCHAR spaceW[] = {' ',0};
static DWORD url_templates[] = {URLTEMPLATE_CUSTOM,
URLTEMPLATE_LOW,
URLTEMPLATE_MEDLOW,
@@ -135,13 +134,9 @@ static void update_zone_info(secdlg_data *sd, DWORD lv_index)
SetWindowTextW(GetDlgItem(sd->hsec, IDC_SEC_ZONE_INFO), za->szDescription);
- name[0] = ' ';
- name[1] = 0;
-
- LoadStringW(hcpl, IDS_SEC_SETTINGS, &name[1], sizeof(name)/sizeof(name[0]) - 3);
+ LoadStringW(hcpl, IDS_SEC_SETTINGS, name, sizeof(name)/sizeof(*name));
len = lstrlenW(name);
- lstrcpynW(&name[len], za->szDisplayName, sizeof(name)/sizeof(name[0]) - len - 3);
- lstrcatW(name, spaceW);
+ lstrcpynW(&name[len], za->szDisplayName, sizeof(name)/sizeof(*name) - len - 1);
TRACE("new title: %s\n", debugstr_w(name));
SetWindowTextW(GetDlgItem(sd->hsec, IDC_SEC_GROUP), name);
--
1.7.7.3
More information about the wine-patches
mailing list