summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRené Schümann <white06tiger@gmail.com>2014-12-25 00:42:45 +0000
committerRené Schümann <white06tiger@gmail.com>2014-12-25 00:42:45 +0000
commit1b725b0b97a2c3d5a2a1f097ce88eede1971adce (patch)
tree21046ebed0c8af9e19e2c7fa564bee407cd87092
parenta85ba257880bbb9e8180f7c77ea6f98b88386152 (diff)
SendSS
! removed window icon as we have our own in our headerbar and two just looks stupid (we got a smaller close button in exchange though...) * ESC now closes SendSS capture and about window (to compensate our new tiny "x" button) git-svn-id: http://svn.miranda-ng.org/main/trunk@11616 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--plugins/SendScreenshotPlus/res/resource.rc8
-rw-r--r--plugins/SendScreenshotPlus/src/UAboutForm.cpp4
-rw-r--r--plugins/SendScreenshotPlus/src/UMainForm.cpp4
3 files changed, 8 insertions, 8 deletions
diff --git a/plugins/SendScreenshotPlus/res/resource.rc b/plugins/SendScreenshotPlus/res/resource.rc
index 4ac2dd9a20..83d8045da7 100644
--- a/plugins/SendScreenshotPlus/res/resource.rc
+++ b/plugins/SendScreenshotPlus/res/resource.rc
@@ -50,8 +50,8 @@ BEGIN
END
IDD_UMainForm DIALOGEX 0, 0, 231, 164
-STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_CONTROLPARENT
+STYLE DS_3DLOOK | DS_CENTER | DS_SHELLFONT | WS_CAPTION | WS_POPUP | WS_SYSMENU
+EXSTYLE WS_EX_TOOLWINDOW | WS_EX_CONTROLPARENT | WS_EX_APPWINDOW
CAPTION "Send screenshot"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
@@ -77,8 +77,8 @@ BEGIN
END
IDD_UAboutForm DIALOGEX 0, 0, 214, 185
-STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_TOPMOST
+STYLE DS_3DLOOK | DS_CENTER | DS_SHELLFONT | WS_CAPTION | WS_MINIMIZEBOX | WS_POPUP | WS_SYSMENU
+EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW | WS_EX_APPWINDOW
CAPTION "About"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
diff --git a/plugins/SendScreenshotPlus/src/UAboutForm.cpp b/plugins/SendScreenshotPlus/src/UAboutForm.cpp
index 9cf6d42cd3..6b64f50203 100644
--- a/plugins/SendScreenshotPlus/src/UAboutForm.cpp
+++ b/plugins/SendScreenshotPlus/src/UAboutForm.cpp
@@ -147,8 +147,8 @@ LRESULT TfrmAbout::wmCommand(WPARAM wParam, LPARAM lParam) {
//---------------------------------------------------------------------------
if (HIWORD(wParam) == BN_CLICKED) {
switch(LOWORD(wParam)) {
- case IDCANCEL:
- case IDCLOSE:
+ case IDCANCEL: // ESC pressed
+ this->Close();
break;
case IDA_btnClose:
Close();
diff --git a/plugins/SendScreenshotPlus/src/UMainForm.cpp b/plugins/SendScreenshotPlus/src/UMainForm.cpp
index 812a9fca16..1f808af0f4 100644
--- a/plugins/SendScreenshotPlus/src/UMainForm.cpp
+++ b/plugins/SendScreenshotPlus/src/UMainForm.cpp
@@ -380,8 +380,8 @@ void TfrmMain::wmCommand(WPARAM wParam, LPARAM lParam) {
switch (HIWORD(wParam)) {
case BN_CLICKED: //Button controls
switch(IDControl) {
- case IDCANCEL:
- case IDCLOSE:
+ case IDCANCEL: // ESC pressed
+ this->Close();
break;
case ID_chkTimed:
m_opt_chkTimed = (BYTE)Button_GetCheck((HWND)lParam);