diff --git a/Language/Arabic.h b/Language/Arabic.h index 632ce8d1..3cb47946 100644 Binary files a/Language/Arabic.h and b/Language/Arabic.h differ diff --git a/Language/Bulgarian.h b/Language/Bulgarian.h index 58a9655e..07351c9b 100644 Binary files a/Language/Bulgarian.h and b/Language/Bulgarian.h differ diff --git a/Language/ChineseSimplified.h b/Language/ChineseSimplified.h index a111cef4..6afcb11b 100644 Binary files a/Language/ChineseSimplified.h and b/Language/ChineseSimplified.h differ diff --git a/Language/ChineseTraditional.h b/Language/ChineseTraditional.h index 9e38f728..9e7f073f 100644 Binary files a/Language/ChineseTraditional.h and b/Language/ChineseTraditional.h differ diff --git a/Language/Croatian.h b/Language/Croatian.h index ee9d6cff..3588f09d 100644 Binary files a/Language/Croatian.h and b/Language/Croatian.h differ diff --git a/Language/Czech.h b/Language/Czech.h index 0e36126a..c33e556d 100644 Binary files a/Language/Czech.h and b/Language/Czech.h differ diff --git a/Language/Danish.h b/Language/Danish.h index 5a9c4591..8fb13a5f 100644 Binary files a/Language/Danish.h and b/Language/Danish.h differ diff --git a/Language/Dutch.h b/Language/Dutch.h index 32c79531..6121c5bf 100644 Binary files a/Language/Dutch.h and b/Language/Dutch.h differ diff --git a/Language/English.h b/Language/English.h index e63eef24..5d807380 100644 Binary files a/Language/English.h and b/Language/English.h differ diff --git a/Language/Finnish.h b/Language/Finnish.h index 0e628e0b..b5af7bde 100644 Binary files a/Language/Finnish.h and b/Language/Finnish.h differ diff --git a/Language/French.h b/Language/French.h index d82f7a6e..5bad99f2 100644 Binary files a/Language/French.h and b/Language/French.h differ diff --git a/Language/German.h b/Language/German.h index 318593ff..683647f5 100644 Binary files a/Language/German.h and b/Language/German.h differ diff --git a/Language/Greek.h b/Language/Greek.h index ca596a02..bac418b3 100644 Binary files a/Language/Greek.h and b/Language/Greek.h differ diff --git a/Language/Hebrew.h b/Language/Hebrew.h index 573d6012..68c80b94 100644 Binary files a/Language/Hebrew.h and b/Language/Hebrew.h differ diff --git a/Language/Hungarian.h b/Language/Hungarian.h index 2b7ee7cf..b78ffaa6 100644 Binary files a/Language/Hungarian.h and b/Language/Hungarian.h differ diff --git a/Language/Indonesian.h b/Language/Indonesian.h index f90968a7..29fdd0e7 100644 Binary files a/Language/Indonesian.h and b/Language/Indonesian.h differ diff --git a/Language/Italian.h b/Language/Italian.h index 3988fa4b..0986ef44 100644 Binary files a/Language/Italian.h and b/Language/Italian.h differ diff --git a/Language/Japanese.h b/Language/Japanese.h index b3dca67c..d7aacd3f 100644 Binary files a/Language/Japanese.h and b/Language/Japanese.h differ diff --git a/Language/Korean.h b/Language/Korean.h index 808e8e71..60c8936d 100644 Binary files a/Language/Korean.h and b/Language/Korean.h differ diff --git a/Language/Latvian.h b/Language/Latvian.h index a75d74fe..eb8afab5 100644 Binary files a/Language/Latvian.h and b/Language/Latvian.h differ diff --git a/Language/Lithuanian.h b/Language/Lithuanian.h index 0c7803fb..ff3a5c16 100644 Binary files a/Language/Lithuanian.h and b/Language/Lithuanian.h differ diff --git a/Language/NorwegianBokmal.h b/Language/NorwegianBokmal.h index c26cfa4b..f7dba559 100644 Binary files a/Language/NorwegianBokmal.h and b/Language/NorwegianBokmal.h differ diff --git a/Language/Polish.h b/Language/Polish.h index 754ae139..1d9c308e 100644 Binary files a/Language/Polish.h and b/Language/Polish.h differ diff --git a/Language/PortugueseBrazil.h b/Language/PortugueseBrazil.h index 524fce1d..f57ac8e1 100644 Binary files a/Language/PortugueseBrazil.h and b/Language/PortugueseBrazil.h differ diff --git a/Language/PortuguesePortugal.h b/Language/PortuguesePortugal.h index 165e9d78..15bc6aff 100644 Binary files a/Language/PortuguesePortugal.h and b/Language/PortuguesePortugal.h differ diff --git a/Language/Resource.rc b/Language/Resource.rc index cd922908..667e6e4c 100644 --- a/Language/Resource.rc +++ b/Language/Resource.rc @@ -2,6 +2,14 @@ #include "../Library/resource.h" #include "../Version.h" +#ifdef LANGUAGE_RTL +#define DIALOG_EXSTYLE_FLAGS WS_EX_APPWINDOW | WS_EX_CONTROLPARENT | WS_EX_LAYOUTRTL +#define STR_ISRTL "1" +#else +#define DIALOG_EXSTYLE_FLAGS WS_EX_APPWINDOW | WS_EX_CONTROLPARENT +#define STR_ISRTL "0" +#endif + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT ///////////////////////////////////////////////////////////////////////////// @@ -137,7 +145,7 @@ IDR_MANAGESKINS_MENU MENU IDD_ABOUT_DIALOG DIALOGEX 0, 0, 400, 210 STYLE DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME -EXSTYLE WS_EX_APPWINDOW | WS_EX_CONTROLPARENT +EXSTYLE DIALOG_EXSTYLE_FLAGS CAPTION STR_ABOUTRAINMETER FONT 8, "MS Shell Dlg 2", 0, 0, 0x0 { @@ -187,7 +195,7 @@ FONT 8, "MS Shell Dlg 2", 0, 0, 0x0 IDD_MANAGE_DIALOG DIALOGEX 0, 0, 500, 322 STYLE DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU -EXSTYLE WS_EX_APPWINDOW | WS_EX_CONTROLPARENT +EXSTYLE DIALOG_EXSTYLE_FLAGS CAPTION STR_MANAGERAINMETER FONT 8, "MS Shell Dlg 2", 0, 0, 0x0 { diff --git a/Language/Romanian.h b/Language/Romanian.h index 9cd1b622..1fe51bc0 100644 Binary files a/Language/Romanian.h and b/Language/Romanian.h differ diff --git a/Language/Russian.h b/Language/Russian.h index d1387e04..637cef74 100644 Binary files a/Language/Russian.h and b/Language/Russian.h differ diff --git a/Language/SerbianCyrillic.h b/Language/SerbianCyrillic.h index 3edfada7..c5c56fa4 100644 Binary files a/Language/SerbianCyrillic.h and b/Language/SerbianCyrillic.h differ diff --git a/Language/SerbianLatin.h b/Language/SerbianLatin.h index 759eee69..cc03b6e9 100644 Binary files a/Language/SerbianLatin.h and b/Language/SerbianLatin.h differ diff --git a/Language/Slovak.h b/Language/Slovak.h index 030f79ce..b1045e69 100644 Binary files a/Language/Slovak.h and b/Language/Slovak.h differ diff --git a/Language/Slovenian.h b/Language/Slovenian.h index 2e27d4d0..168967af 100644 Binary files a/Language/Slovenian.h and b/Language/Slovenian.h differ diff --git a/Language/SpanishModern.h b/Language/SpanishModern.h index 3dfc4aba..27e4c8b9 100644 Binary files a/Language/SpanishModern.h and b/Language/SpanishModern.h differ diff --git a/Language/Swedish.h b/Language/Swedish.h index b50bd483..1c280c24 100644 Binary files a/Language/Swedish.h and b/Language/Swedish.h differ diff --git a/Language/Turkish.h b/Language/Turkish.h index 8f3d7e94..13e66d0b 100644 Binary files a/Language/Turkish.h and b/Language/Turkish.h differ diff --git a/Language/Ukrainian.h b/Language/Ukrainian.h index 0e79c046..912eebd4 100644 Binary files a/Language/Ukrainian.h and b/Language/Ukrainian.h differ diff --git a/Language/Vietnamese.h b/Language/Vietnamese.h index 08536355..91015797 100644 Binary files a/Language/Vietnamese.h and b/Language/Vietnamese.h differ diff --git a/Library/Dialog.cpp b/Library/Dialog.cpp index 01c213ab..ad7a5a8e 100644 --- a/Library/Dialog.cpp +++ b/Library/Dialog.cpp @@ -65,11 +65,6 @@ INT_PTR CDialog::OnActivate(WPARAM wParam, LPARAM lParam) return FALSE; } -void CDialog::SetDialogRTL(HWND window) -{ - SetWindowLongPtr(window, GWL_EXSTYLE, GetWindowLongPtr(window, GWL_EXSTYLE) | WS_EX_LAYOUTRTL); -} - /* ** Sets dialog font to UI font. ** diff --git a/Library/Dialog.h b/Library/Dialog.h index 9981bcf8..3fda21ba 100644 --- a/Library/Dialog.h +++ b/Library/Dialog.h @@ -53,9 +53,6 @@ protected: INT_PTR OnActivate(WPARAM wParam, LPARAM lParam); - void SetDialogRTL(HWND window); - void SetDialogRTL() { SetDialogRTL(m_Window); } - void SetDialogFont(HWND window); void SetDialogFont() { SetDialogFont(m_Window); } diff --git a/Library/DialogAbout.cpp b/Library/DialogAbout.cpp index 5c1d77d9..945205e6 100644 --- a/Library/DialogAbout.cpp +++ b/Library/DialogAbout.cpp @@ -260,12 +260,6 @@ INT_PTR CDialogAbout::OnInitDialog(WPARAM wParam, LPARAM lParam) HICON hIcon = GetIcon(IDI_RAINMETER); SendMessage(m_Window, WM_SETICON, ICON_SMALL, (LPARAM)hIcon); - if (*GetString(ID_STR_ISRTL) == L'1') - { - // Use RTL layout if using a RTL language - SetDialogRTL(); - } - item = GetDlgItem(m_Window, IDC_ABOUT_TAB); TCITEM tci = {0}; tci.mask = TCIF_TEXT; diff --git a/Library/DialogManage.cpp b/Library/DialogManage.cpp index fee04fd3..b7175cb4 100644 --- a/Library/DialogManage.cpp +++ b/Library/DialogManage.cpp @@ -212,12 +212,6 @@ INT_PTR CDialogManage::OnInitDialog(WPARAM wParam, LPARAM lParam) HICON hIcon = GetIcon(IDI_RAINMETER); SendMessage(m_Window, WM_SETICON, ICON_SMALL, (LPARAM)hIcon); - if (*GetString(ID_STR_ISRTL) == L'1') - { - // Use RTL layout if using a RTL language - SetDialogRTL(); - } - item = GetDlgItem(m_Window, IDC_MANAGE_TAB); TCITEM tci = {0}; tci.mask = TCIF_TEXT;