summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2014-01-19 18:35:59 +0000
committerGeorge Hazan <george.hazan@gmail.com>2014-01-19 18:35:59 +0000
commit4a9e3209328ff6583370352d4ff35ac881c66e4e (patch)
treea82ebd7960482de185e5ea66ec380e0668937ad9
parente129bab57fb1b3eb8d6adb9c87c490c04cc51adb (diff)
- in tabSRMM the small icon's size is 12, not 10;
- fix for log icons in StdChat git-svn-id: http://svn.miranda-ng.org/main/trunk@7765 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--plugins/TabSRMM/src/chat/main.cpp2
-rw-r--r--src/modules/chat/chat_svc.cpp2
-rw-r--r--src/modules/chat/manager.cpp1
3 files changed, 3 insertions, 2 deletions
diff --git a/plugins/TabSRMM/src/chat/main.cpp b/plugins/TabSRMM/src/chat/main.cpp
index d2523bd726..d591af8046 100644
--- a/plugins/TabSRMM/src/chat/main.cpp
+++ b/plugins/TabSRMM/src/chat/main.cpp
@@ -158,7 +158,7 @@ static void OnLoadSettings()
replaceStrT(g_Settings.pszLogDir, M.getChatLogPath());
- g_Settings.LogIconSize = (g_Settings.bScaleIcons) ? 10 : 16;
+ g_Settings.LogIconSize = (g_Settings.bScaleIcons) ? 12 : 16;
g_Settings.iSplitterY = db_get_w(NULL, "Chat", "splitY", 50);
if (g_Settings.iSplitterY <= 20)
diff --git a/src/modules/chat/chat_svc.cpp b/src/modules/chat/chat_svc.cpp
index eae370c191..e38da6069c 100644
--- a/src/modules/chat/chat_svc.cpp
+++ b/src/modules/chat/chat_svc.cpp
@@ -543,6 +543,8 @@ static INT_PTR Service_GetAddEventPtr(WPARAM wParam, LPARAM lParam)
static int ModulesLoaded(WPARAM wParam, LPARAM lParam)
{
+ LoadChatIcons();
+
HookEvent(ME_SMILEYADD_OPTIONSCHANGED, SmileyOptionsChanged);
HookEvent(ME_CLIST_PREBUILDCONTACTMENU, PrebuildContactMenu);
diff --git a/src/modules/chat/manager.cpp b/src/modules/chat/manager.cpp
index edc6b5fc69..0873dae5c3 100644
--- a/src/modules/chat/manager.cpp
+++ b/src/modules/chat/manager.cpp
@@ -1476,7 +1476,6 @@ INT_PTR SvcGetChatManager(WPARAM wParam, LPARAM lParam)
ci.pLogIconBmpBits = pLogIconBmpBits;
ci.logIconBmpSize = logIconBmpSize;
- LoadChatIcons();
RegisterFonts();
OptionsInit();
return (INT_PTR)&ci;