diff options
| author | George Hazan <ghazan@miranda.im> | 2022-02-16 17:23:59 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2022-02-16 17:23:59 +0300 |
| commit | 58896c67fdc310f5501990afd758da23ff64d3c0 (patch) | |
| tree | b54a2fb79bf33f43e190337345c13538b1400dd0 /src/mir_app | |
| parent | 94e76a5c75a16273ac41fd1692d103b15b5dd092 (diff) | |
fixes #3033 ("Gap between buttons" option is broken)
Diffstat (limited to 'src/mir_app')
| -rw-r--r-- | src/mir_app/src/mir_app.def | 1 | ||||
| -rw-r--r-- | src/mir_app/src/mir_app64.def | 1 | ||||
| -rw-r--r-- | src/mir_app/src/srmm_toolbar.cpp | 13 |
3 files changed, 12 insertions, 3 deletions
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index 20befc32d3..e4dd6236b9 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -792,3 +792,4 @@ _Netlib_SslWrite@12 @877 NONAME ?SafeRecycleBin@PU@@YGHPB_W@Z @880 NONAME
?IsMirandaFolderWritable@PU@@YG_NXZ @881 NONAME
?IsDuplicateEvent@DB@@YG_NIAAUDBEVENTINFO@@@Z @882 NONAME
+Srmm_GetButtonGap @883
diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index 0330b8708a..b8b265a9d3 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -792,3 +792,4 @@ Netlib_SslWrite @877 NONAME ?SafeRecycleBin@PU@@YAHPEB_W@Z @880 NONAME
?IsMirandaFolderWritable@PU@@YA_NXZ @881 NONAME
?IsDuplicateEvent@DB@@YA_NIAEAUDBEVENTINFO@@@Z @882 NONAME
+Srmm_GetButtonGap @883
diff --git a/src/mir_app/src/srmm_toolbar.cpp b/src/mir_app/src/srmm_toolbar.cpp index ac52b6b296..7d4b45bf8f 100644 --- a/src/mir_app/src/srmm_toolbar.cpp +++ b/src/mir_app/src/srmm_toolbar.cpp @@ -32,6 +32,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. static double g_DPIscaleX, g_DPIscaleY; +static CMOption<uint8_t> g_iButtonGap(BB_MODULE_NAME, "ButtonsBarGap", 1); + static int SortButtons(const CustomButtonData *p1, const CustomButtonData *p2) { if (p1->m_bRSided != p2->m_bRSided) @@ -79,6 +81,11 @@ MIR_APP_DLL(int) Srmm_GetButtonCount(void) return arButtonsList.getCount(); } +MIR_APP_DLL(int) Srmm_GetButtonGap() +{ + return g_iButtonGap; +} + MIR_APP_DLL(HANDLE) Srmm_AddButton(const BBButton *bbdi, HPLUGIN _hLang) { if (bbdi == nullptr) @@ -624,7 +631,7 @@ public: m_btnChat.Disable(); m_btnHidden.Disable(); - m_gap.SetPosition(db_get_b(0, BB_MODULE_NAME, "ButtonsBarGap", 1)); + m_gap.SetPosition(g_iButtonGap); return true; } @@ -641,9 +648,9 @@ public: CB_ReInitCustomButtons(); uint16_t newGap = m_gap.GetPosition(); - if (newGap != db_get_b(0, BB_MODULE_NAME, "ButtonsBarGap", 1)) { + if (newGap != g_iButtonGap) { + g_iButtonGap = newGap; WindowList_BroadcastAsync(g_hWindowList, WM_SIZE, 0, 0); - db_set_b(0, BB_MODULE_NAME, "ButtonsBarGap", newGap); } BuildMenuObjectsTree(); |