diff options
| author | pescuma <pescuma@c086bb3d-8645-0410-b8da-73a8550f86e7> | 2008-03-17 01:25:20 +0000 |
|---|---|---|
| committer | pescuma <pescuma@c086bb3d-8645-0410-b8da-73a8550f86e7> | 2008-03-17 01:25:20 +0000 |
| commit | b1bcfe11e40f2eb7e53ef0f8d992df0fb179b173 (patch) | |
| tree | 636f4cf1261e469e708f200800880a2a805e1c9b /Plugins/emoticons/selwin.cpp | |
| parent | d99eb14835a65e3cf3a97683f215dfb83565b844 (diff) | |
Allow URLs in emoticon packs
Flash emoticons
Added Skype and Sametime emoticons
Option to select which frame to show in selection window (for animated gif and swf)
git-svn-id: http://pescuma.googlecode.com/svn/trunk/Miranda@70 c086bb3d-8645-0410-b8da-73a8550f86e7
Diffstat (limited to 'Plugins/emoticons/selwin.cpp')
| -rw-r--r-- | Plugins/emoticons/selwin.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Plugins/emoticons/selwin.cpp b/Plugins/emoticons/selwin.cpp index 0229609..9aba03c 100644 --- a/Plugins/emoticons/selwin.cpp +++ b/Plugins/emoticons/selwin.cpp @@ -2,8 +2,9 @@ #define MIN_COLS 5
-#define MAX_LINES 5
-#define BORDER 5
+#define MAX_LINES 8
+#define MAX_COLS 12
+#define BORDER 3
struct EmoticonSelectionData
@@ -236,7 +237,7 @@ INT_PTR CALLBACK EmoticonSeletionDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPA ssd->cols = num_emotes / MAX_LINES;
if (num_emotes % MAX_LINES != 0)
ssd->cols++;
- ssd->cols = max(ssd->cols, MIN_COLS);
+ ssd->cols = min(max(ssd->cols, MIN_COLS), MAX_COLS);
ssd->lines = num_emotes / ssd->cols;
if (num_emotes % ssd->cols != 0)
@@ -445,6 +446,7 @@ INT_PTR CALLBACK EmoticonSeletionDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPA // Copy buffer to screen
BitBlt(hdc_orig, rc.left, rc.top, rc.right - rc.left,
rc.bottom - rc.top, hdc, rc.left, rc.top, SRCCOPY);
+
DeleteDC(hdc);
DeleteObject(hBmp);
|