From 1e924f89a95521efacbb214f986736437de858c1 Mon Sep 17 00:00:00 2001 From: sje Date: Wed, 31 Jan 2007 12:06:05 +0000 Subject: restored resize git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@98 4f64403b-2f21-0410-a795-97e2b3489a10 --- yapp/YAPP.mdsp | 8 ++++---- yapp/popup_history_dlg.cpp | 22 +++++++++++++--------- yapp/popups2.rc | 2 +- yapp/version.h | 2 +- 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/yapp/YAPP.mdsp b/yapp/YAPP.mdsp index 93c8aa9..5df6b20 100644 --- a/yapp/YAPP.mdsp +++ b/yapp/YAPP.mdsp @@ -110,11 +110,11 @@ extraResourceOptions= 1=popups2.rc 2=version.rc [History] -version.h,122 -common.h,2419 +common.h,2413 popup_history.cpp,2330 popwin.cpp,0 resource.rc,23 version.rc,24 -resource.h,2164 -popups2.rc,56 +resource.h,2162 +popups2.rc,830 +version.h,818 diff --git a/yapp/popup_history_dlg.cpp b/yapp/popup_history_dlg.cpp index c18ba80..1373526 100644 --- a/yapp/popup_history_dlg.cpp +++ b/yapp/popup_history_dlg.cpp @@ -204,6 +204,7 @@ int CalcCustomControlPos(IEVIEWWINDOW *ieWnd, HWND hMainWindow) RECT rect; GetWindowRect(GetDlgItem(hMainWindow, IDC_LST_HISTORY), &rect); ScreenToClient(hMainWindow, &rect); + //GetClientRect(hMainWindow, &rect); ieWnd->x = rect.left + GAP_SIZE; ieWnd->y = rect.top + GAP_SIZE; @@ -626,10 +627,10 @@ BOOL CALLBACK DlgProcHistLst(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) RefreshPopupHistory(hWnd, renderer); bInitializing = 0; - + return TRUE; - } - + } + case WM_DESTROY: { UnloadRenderer(hWnd, lstPopupHistory.GetRenderer()); @@ -640,6 +641,7 @@ BOOL CALLBACK DlgProcHistLst(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) case WM_CLOSE: { + //Utils_SaveWindowPosition(hWnd, 0, MODULE, "history_dlg"); DestroyWindow(hWnd); break; @@ -647,11 +649,8 @@ BOOL CALLBACK DlgProcHistLst(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) case WM_WINDOWPOSCHANGING: { - HDWP hdWnds = BeginDeferWindowPos(4); - RECT rParent; WINDOWPOS *wndPos = (WINDOWPOS *) lParam; - GetWindowRect(hWnd, &rParent); - + if (wndPos->cx < MIN_HISTORY_WIDTH) { wndPos->cx = MIN_HISTORY_WIDTH; @@ -660,16 +659,21 @@ BOOL CALLBACK DlgProcHistLst(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { wndPos->cy = MIN_HISTORY_HEIGHT; } + + RECT rParent; + GetWindowRect(hWnd, &rParent); + HDWP hdWnds = BeginDeferWindowPos(4); + AddAnchorWindowToDeferList(hdWnds, GetDlgItem(hWnd, IDC_CLOSE), &rParent, wndPos, ANCHOR_RIGHT | ANCHOR_BOTTOM); AddAnchorWindowToDeferList(hdWnds, GetDlgItem(hWnd, IDC_HISTORY_FILTER), &rParent, wndPos, ANCHOR_LEFT | ANCHOR_BOTTOM); AddAnchorWindowToDeferList(hdWnds, GetDlgItem(hWnd, IDC_HISTORY_FILTER_CASESENSITIVE), &rParent, wndPos, ANCHOR_LEFT | ANCHOR_RIGHT | ANCHOR_BOTTOM); AddAnchorWindowToDeferList(hdWnds, GetDlgItem(hWnd, IDC_LST_HISTORY), &rParent, wndPos, ANCHOR_ALL); - + EndDeferWindowPos(hdWnds); MoveCustomControl(hWnd, lstPopupHistory.GetRenderer()); //move the custom control too, if any - break; } + case WM_COMMAND: { diff --git a/yapp/popups2.rc b/yapp/popups2.rc index daf9b25..f43f15f 100644 --- a/yapp/popups2.rc +++ b/yapp/popups2.rc @@ -65,7 +65,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_AUS // IDD_LST_HISTORY DIALOGEX 0, 0, 467, 303 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Popup history" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN diff --git a/yapp/version.h b/yapp/version.h index 0d2565d..a5ec130 100644 --- a/yapp/version.h +++ b/yapp/version.h @@ -4,7 +4,7 @@ #define __MAJOR_VERSION 0 #define __MINOR_VERSION 2 #define __RELEASE_NUM 1 -#define __BUILD_NUM 7 +#define __BUILD_NUM 8 #define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM #define __FILEVERSION_STRING_DOTS __MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM -- cgit v1.2.3