added logging when dpi changes

EditFrameWnd.cpp

@@ -1,289 +1,290 @@
-// EditFrameWnd.cpp : implementation file
-//
-
-#include "stdafx.h"
-#include "CP_Main.h"
-#include "EditFrameWnd.h"
-#include ".\editframewnd.h"
-
-#define TIMER_BUTTON_UP 1
-
-// CEditFrameWnd
-
-IMPLEMENT_DYNCREATE(CEditFrameWnd, CFrameWnd)
-
-CEditFrameWnd::CEditFrameWnd()
-{
-	m_bAutoMenuEnable = FALSE;
-}
-
-CEditFrameWnd::~CEditFrameWnd()
-{
-}
-
-
-BEGIN_MESSAGE_MAP(CEditFrameWnd, CFrameWnd)
-	ON_WM_CREATE()
-	ON_WM_DESTROY()
-	ON_WM_SIZE()
-	ON_COMMAND(ID_BUTTON_SAVE, OnDummy)
-	ON_COMMAND(ID_BUTTON_SAVE_ALL, OnDummy)
-	ON_COMMAND(ID_BUTTON_CLOSE, OnDummy)
-	ON_COMMAND(ID_BUTTON_NEW, OnDummy)
-	ON_COMMAND(ID_BUTTON_SAVE_CLOSE_CLIPBOARD, OnDummy)
-	ON_WM_SETFOCUS()
-	ON_WM_CLOSE()
-	ON_WM_NCCALCSIZE()
-	ON_WM_NCPAINT()
-	ON_WM_NCHITTEST()
-	ON_WM_NCLBUTTONDOWN()
-	ON_WM_NCLBUTTONUP()
-	ON_WM_NCMOUSEMOVE()
-	ON_WM_NCLBUTTONDBLCLK()
-	ON_WM_WINDOWPOSCHANGING()
-	ON_WM_TIMER()
-	ON_MESSAGE(WM_DPICHANGED, OnDpiChanged)
-	ON_WM_MOVING()
-	ON_WM_ENTERSIZEMOVE()
-END_MESSAGE_MAP()
-
-
-// CEditFrameWnd message handlers
-
-int CEditFrameWnd::OnCreate(LPCREATESTRUCT lpCreateStruct)
-{
-	if (CFrameWnd::OnCreate(lpCreateStruct) == -1)
-		return -1;
-
-	ModifyStyle(WS_CAPTION|WS_BORDER|WS_OVERLAPPED|0x0000C000|WS_THICKFRAME|WS_DLGFRAME|WS_SYSMENU|WS_MINIMIZEBOX|WS_MAXIMIZEBOX, 0, SWP_DRAWFRAME); 
-	ModifyStyleEx(WS_EX_CLIENTEDGE, 0, 0);
-		
-	CString csTitle = theApp.m_Language.GetString("Ditto_Edit", "Ditto Edit");
-	m_EditWnd.Create(NULL, csTitle, WS_CHILD, CRect(0, 0, 0, 0), this, 100, NULL);
-	m_EditWnd.ShowWindow(SW_SHOW);
-
-	MoveControls();   
-
-	m_DittoWindow.DoCreate(this);
-	m_DittoWindow.m_bDrawChevron = false;
-	m_DittoWindow.SetCaptionColors(g_Opt.m_Theme.CaptionLeft(), g_Opt.m_Theme.CaptionRight(), g_Opt.m_Theme.Border());
-	m_DittoWindow.SetCaptionOn(this, CAPTION_TOP, true, g_Opt.m_Theme.GetCaptionSize(), g_Opt.m_Theme.GetCaptionFontSize());
-
-	m_crIcon.SetRect(-2, -15, 15, 0);
-
-	SetWindowText(_T("Ditto Editor"));
-
-	return 0;
-}
-
-void CEditFrameWnd::OnDestroy()
-{
-	CFrameWnd::OnDestroy();
-
-	CRect rect;
-	GetWindowRect(&rect);
-	CGetSetOptions::SetEditWndSize(rect.Size());
-	CGetSetOptions::SetEditWndPoint(rect.TopLeft());
-
-	::SendMessage(m_hNotifyWnd, WM_EDIT_WND_CLOSING, 0, 0);
-}
-
-void CEditFrameWnd::OnSize(UINT nType, int cx, int cy)
-{
-	CFrameWnd::OnSize(nType, cx, cy);
-	MoveControls();
-}
-
-void CEditFrameWnd::MoveControls()
-{
-	if(::IsWindow(m_EditWnd.GetSafeHwnd()))
-	{
-		CRect cr;
-		GetClientRect(cr);
-		m_EditWnd.MoveWindow(cr);
-	}
-}
-
-bool CEditFrameWnd::EditIds(CClipIDs &Ids)
-{
-	return m_EditWnd.EditIds(Ids);
-}
-
-BOOL CEditFrameWnd::PreCreateWindow(CREATESTRUCT& cs)
-{
-	if(cs.hMenu!=NULL)  
-	{
-		::DestroyMenu(cs.hMenu);      // delete menu if loaded
-		cs.hMenu = NULL;              // no menu for this window
-	}
-
-	WNDCLASS wc;	
-	wc.style = CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW;
-	wc.lpfnWndProc = AfxWndProc;
-	wc.cbClsExtra = 0;
-	wc.cbWndExtra = 0;
-	wc.hInstance = AfxGetInstanceHandle();
-	wc.hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
-	wc.hCursor = LoadCursor(NULL, IDC_ARROW);
-	wc.hbrBackground = (HBRUSH)GetStockObject(WHITE_BRUSH);
-	wc.lpszMenuName =  NULL;
-	wc.lpszClassName = _T("Ditto Edit Wnd");
-
-	// Create the QPaste window class
-	if (!AfxRegisterClass(&wc))
-		return FALSE;
-
-	cs.lpszClass = wc.lpszClassName;
-
-	return CFrameWnd::PreCreateWindow(cs);
-}
-
-void CEditFrameWnd::OnDummy()
-{
-
-}
-
-
-void CEditFrameWnd::OnSetFocus(CWnd* pOldWnd)
-{
-	CFrameWnd::OnSetFocus(pOldWnd);
-
-	m_EditWnd.SetFocus();
-}
-
-void CEditFrameWnd::OnClose()
-{
-	if(m_EditWnd.CloseEdits(true) == false)
-		return;
-
-	CFrameWnd::OnClose();
-}
-
-void CEditFrameWnd::OnNcCalcSize(BOOL bCalcValidRects, NCCALCSIZE_PARAMS FAR* lpncsp) 
-{
-	CWnd::OnNcCalcSize(bCalcValidRects, lpncsp);
-
-	m_DittoWindow.DoNcCalcSize(bCalcValidRects, lpncsp);
-}
-
-void CEditFrameWnd::OnNcPaint()
-{
-	m_DittoWindow.DoNcPaint(this);	
-}
-
-HITTEST_RET CEditFrameWnd::OnNcHitTest(CPoint point) 
-{
-	UINT Ret = m_DittoWindow.DoNcHitTest(this, point);
-	if(Ret == -1)
-		return CWnd::OnNcHitTest(point);
-
-	return Ret;
-}
-void CEditFrameWnd::OnNcLButtonDown(UINT nHitTest, CPoint point)
-{
-	int buttonPressed = m_DittoWindow.DoNcLButtonDown(this, nHitTest, point);
-
-	if (buttonPressed != 0)
-	{
-		SetTimer(TIMER_BUTTON_UP, 100, NULL);
-	}
-
-	CFrameWnd::OnNcLButtonDown(nHitTest, point);
-}
-
-void CEditFrameWnd::OnNcLButtonUp(UINT nHitTest, CPoint point)
-{
-	if(m_DittoWindow.DoNcLButtonUp(this, nHitTest, point) > 0)
-		return;
-
-	KillTimer(TIMER_BUTTON_UP);
-
-	CFrameWnd::OnNcLButtonUp(nHitTest, point);
-}
-
-void CEditFrameWnd::OnNcMouseMove(UINT nHitTest, CPoint point)
-{
-	m_DittoWindow.DoNcMouseMove(this, nHitTest, point);
-
-	CFrameWnd::OnNcMouseMove(nHitTest, point);
-}
-
-BOOL CEditFrameWnd::PreTranslateMessage(MSG* pMsg)
-{
-	m_DittoWindow.DoPreTranslateMessage(pMsg);
-
-	return CFrameWnd::PreTranslateMessage(pMsg);
-}
-
-bool CEditFrameWnd::CloseAll()
-{
-	return m_EditWnd.CloseEdits(true);
-}
-void CEditFrameWnd::OnNcLButtonDblClk(UINT nHitTest, CPoint point)
-{
-	CPoint pt(point);
-	ScreenToClient(&pt);
-	if(m_crIcon.PtInRect(pt))
-	{
-		CloseAll();
-		OnClose();
-		return;
-	}
-
-	CFrameWnd::OnNcLButtonDblClk(nHitTest, point);
-}
-
-void CEditFrameWnd::OnWindowPosChanging(WINDOWPOS* lpwndpos)
-{
-	CFrameWnd::OnWindowPosChanging(lpwndpos);
-}
-
-void CEditFrameWnd::OnTimer(UINT_PTR nIDEvent)
-{
-	switch (nIDEvent)
-	{
-		case TIMER_BUTTON_UP:
-		{
-			if ((GetKeyState(VK_LBUTTON) & 0x100) == 0)
-			{
-				m_DittoWindow.DoNcLButtonUp(this, 0, CPoint(0, 0));
-				KillTimer(TIMER_BUTTON_UP);
-			}
-			break;
-		}
-	}
-
-	CWnd::OnTimer(nIDEvent);
-}
-
-LRESULT CEditFrameWnd::OnDpiChanged(WPARAM wParam, LPARAM lParam)
-{
-	int dpi = HIWORD(wParam);
-	m_DittoWindow.OnDpiChanged(this, dpi);
-
-	RECT* const prcNewWindow = (RECT*)lParam;
-	SetWindowPos(NULL,
-		prcNewWindow->left,
-		prcNewWindow->top,
-		prcNewWindow->right - prcNewWindow->left,
-		prcNewWindow->bottom - prcNewWindow->top,
-		SWP_NOZORDER | SWP_NOACTIVATE);
-
-
-	this->Invalidate();
-	this->UpdateWindow();
-
-	return TRUE;
-}
-
-void CEditFrameWnd::OnMoving(UINT fwSide, LPRECT pRect)
-{
-	CWnd::OnMoving(fwSide, pRect);
-	m_snap.OnSnapMoving(m_hWnd, pRect);
-}
-
-void CEditFrameWnd::OnEnterSizeMove()
-{
-	m_snap.OnSnapEnterSizeMove(m_hWnd);
-	CWnd::OnEnterSizeMove();
+// EditFrameWnd.cpp : implementation file
+//
+
+#include "stdafx.h"
+#include "CP_Main.h"
+#include "EditFrameWnd.h"
+#include ".\editframewnd.h"
+
+#define TIMER_BUTTON_UP 1
+
+// CEditFrameWnd
+
+IMPLEMENT_DYNCREATE(CEditFrameWnd, CFrameWnd)
+
+CEditFrameWnd::CEditFrameWnd()
+{
+	m_bAutoMenuEnable = FALSE;
+}
+
+CEditFrameWnd::~CEditFrameWnd()
+{
+}
+
+
+BEGIN_MESSAGE_MAP(CEditFrameWnd, CFrameWnd)
+	ON_WM_CREATE()
+	ON_WM_DESTROY()
+	ON_WM_SIZE()
+	ON_COMMAND(ID_BUTTON_SAVE, OnDummy)
+	ON_COMMAND(ID_BUTTON_SAVE_ALL, OnDummy)
+	ON_COMMAND(ID_BUTTON_CLOSE, OnDummy)
+	ON_COMMAND(ID_BUTTON_NEW, OnDummy)
+	ON_COMMAND(ID_BUTTON_SAVE_CLOSE_CLIPBOARD, OnDummy)
+	ON_WM_SETFOCUS()
+	ON_WM_CLOSE()
+	ON_WM_NCCALCSIZE()
+	ON_WM_NCPAINT()
+	ON_WM_NCHITTEST()
+	ON_WM_NCLBUTTONDOWN()
+	ON_WM_NCLBUTTONUP()
+	ON_WM_NCMOUSEMOVE()
+	ON_WM_NCLBUTTONDBLCLK()
+	ON_WM_WINDOWPOSCHANGING()
+	ON_WM_TIMER()
+	ON_MESSAGE(WM_DPICHANGED, OnDpiChanged)
+	ON_WM_MOVING()
+	ON_WM_ENTERSIZEMOVE()
+END_MESSAGE_MAP()
+
+
+// CEditFrameWnd message handlers
+
+int CEditFrameWnd::OnCreate(LPCREATESTRUCT lpCreateStruct)
+{
+	if (CFrameWnd::OnCreate(lpCreateStruct) == -1)
+		return -1;
+
+	ModifyStyle(WS_CAPTION|WS_BORDER|WS_OVERLAPPED|0x0000C000|WS_THICKFRAME|WS_DLGFRAME|WS_SYSMENU|WS_MINIMIZEBOX|WS_MAXIMIZEBOX, 0, SWP_DRAWFRAME); 
+	ModifyStyleEx(WS_EX_CLIENTEDGE, 0, 0);
+		
+	CString csTitle = theApp.m_Language.GetString("Ditto_Edit", "Ditto Edit");
+	m_EditWnd.Create(NULL, csTitle, WS_CHILD, CRect(0, 0, 0, 0), this, 100, NULL);
+	m_EditWnd.ShowWindow(SW_SHOW);
+
+	MoveControls();   
+
+	m_DittoWindow.DoCreate(this);
+	m_DittoWindow.m_bDrawChevron = false;
+	m_DittoWindow.SetCaptionColors(g_Opt.m_Theme.CaptionLeft(), g_Opt.m_Theme.CaptionRight(), g_Opt.m_Theme.Border());
+	m_DittoWindow.SetCaptionOn(this, CAPTION_TOP, true, g_Opt.m_Theme.GetCaptionSize(), g_Opt.m_Theme.GetCaptionFontSize());
+
+	m_crIcon.SetRect(-2, -15, 15, 0);
+
+	SetWindowText(_T("Ditto Editor"));
+
+	return 0;
+}
+
+void CEditFrameWnd::OnDestroy()
+{
+	CFrameWnd::OnDestroy();
+
+	CRect rect;
+	GetWindowRect(&rect);
+	CGetSetOptions::SetEditWndSize(rect.Size());
+	CGetSetOptions::SetEditWndPoint(rect.TopLeft());
+
+	::SendMessage(m_hNotifyWnd, WM_EDIT_WND_CLOSING, 0, 0);
+}
+
+void CEditFrameWnd::OnSize(UINT nType, int cx, int cy)
+{
+	CFrameWnd::OnSize(nType, cx, cy);
+	MoveControls();
+}
+
+void CEditFrameWnd::MoveControls()
+{
+	if(::IsWindow(m_EditWnd.GetSafeHwnd()))
+	{
+		CRect cr;
+		GetClientRect(cr);
+		m_EditWnd.MoveWindow(cr);
+	}
+}
+
+bool CEditFrameWnd::EditIds(CClipIDs &Ids)
+{
+	return m_EditWnd.EditIds(Ids);
+}
+
+BOOL CEditFrameWnd::PreCreateWindow(CREATESTRUCT& cs)
+{
+	if(cs.hMenu!=NULL)  
+	{
+		::DestroyMenu(cs.hMenu);      // delete menu if loaded
+		cs.hMenu = NULL;              // no menu for this window
+	}
+
+	WNDCLASS wc;	
+	wc.style = CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW;
+	wc.lpfnWndProc = AfxWndProc;
+	wc.cbClsExtra = 0;
+	wc.cbWndExtra = 0;
+	wc.hInstance = AfxGetInstanceHandle();
+	wc.hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
+	wc.hCursor = LoadCursor(NULL, IDC_ARROW);
+	wc.hbrBackground = (HBRUSH)GetStockObject(WHITE_BRUSH);
+	wc.lpszMenuName =  NULL;
+	wc.lpszClassName = _T("Ditto Edit Wnd");
+
+	// Create the QPaste window class
+	if (!AfxRegisterClass(&wc))
+		return FALSE;
+
+	cs.lpszClass = wc.lpszClassName;
+
+	return CFrameWnd::PreCreateWindow(cs);
+}
+
+void CEditFrameWnd::OnDummy()
+{
+
+}
+
+
+void CEditFrameWnd::OnSetFocus(CWnd* pOldWnd)
+{
+	CFrameWnd::OnSetFocus(pOldWnd);
+
+	m_EditWnd.SetFocus();
+}
+
+void CEditFrameWnd::OnClose()
+{
+	if(m_EditWnd.CloseEdits(true) == false)
+		return;
+
+	CFrameWnd::OnClose();
+}
+
+void CEditFrameWnd::OnNcCalcSize(BOOL bCalcValidRects, NCCALCSIZE_PARAMS FAR* lpncsp) 
+{
+	CWnd::OnNcCalcSize(bCalcValidRects, lpncsp);
+
+	m_DittoWindow.DoNcCalcSize(bCalcValidRects, lpncsp);
+}
+
+void CEditFrameWnd::OnNcPaint()
+{
+	m_DittoWindow.DoNcPaint(this);	
+}
+
+HITTEST_RET CEditFrameWnd::OnNcHitTest(CPoint point) 
+{
+	UINT Ret = m_DittoWindow.DoNcHitTest(this, point);
+	if(Ret == -1)
+		return CWnd::OnNcHitTest(point);
+
+	return Ret;
+}
+void CEditFrameWnd::OnNcLButtonDown(UINT nHitTest, CPoint point)
+{
+	int buttonPressed = m_DittoWindow.DoNcLButtonDown(this, nHitTest, point);
+
+	if (buttonPressed != 0)
+	{
+		SetTimer(TIMER_BUTTON_UP, 100, NULL);
+	}
+
+	CFrameWnd::OnNcLButtonDown(nHitTest, point);
+}
+
+void CEditFrameWnd::OnNcLButtonUp(UINT nHitTest, CPoint point)
+{
+	if(m_DittoWindow.DoNcLButtonUp(this, nHitTest, point) > 0)
+		return;
+
+	KillTimer(TIMER_BUTTON_UP);
+
+	CFrameWnd::OnNcLButtonUp(nHitTest, point);
+}
+
+void CEditFrameWnd::OnNcMouseMove(UINT nHitTest, CPoint point)
+{
+	m_DittoWindow.DoNcMouseMove(this, nHitTest, point);
+
+	CFrameWnd::OnNcMouseMove(nHitTest, point);
+}
+
+BOOL CEditFrameWnd::PreTranslateMessage(MSG* pMsg)
+{
+	m_DittoWindow.DoPreTranslateMessage(pMsg);
+
+	return CFrameWnd::PreTranslateMessage(pMsg);
+}
+
+bool CEditFrameWnd::CloseAll()
+{
+	return m_EditWnd.CloseEdits(true);
+}
+void CEditFrameWnd::OnNcLButtonDblClk(UINT nHitTest, CPoint point)
+{
+	CPoint pt(point);
+	ScreenToClient(&pt);
+	if(m_crIcon.PtInRect(pt))
+	{
+		CloseAll();
+		OnClose();
+		return;
+	}
+
+	CFrameWnd::OnNcLButtonDblClk(nHitTest, point);
+}
+
+void CEditFrameWnd::OnWindowPosChanging(WINDOWPOS* lpwndpos)
+{
+	CFrameWnd::OnWindowPosChanging(lpwndpos);
+}
+
+void CEditFrameWnd::OnTimer(UINT_PTR nIDEvent)
+{
+	switch (nIDEvent)
+	{
+		case TIMER_BUTTON_UP:
+		{
+			if ((GetKeyState(VK_LBUTTON) & 0x100) == 0)
+			{
+				m_DittoWindow.DoNcLButtonUp(this, 0, CPoint(0, 0));
+				KillTimer(TIMER_BUTTON_UP);
+			}
+			break;
+		}
+	}
+
+	CWnd::OnTimer(nIDEvent);
+}
+
+LRESULT CEditFrameWnd::OnDpiChanged(WPARAM wParam, LPARAM lParam)
+{
+	int dpi = HIWORD(wParam);
+	m_DittoWindow.OnDpiChanged(this, dpi);
+
+	RECT* const prcNewWindow = (RECT*)lParam;
+	SetWindowPos(NULL,
+		prcNewWindow->left,
+		prcNewWindow->top,
+		prcNewWindow->right - prcNewWindow->left,
+		prcNewWindow->bottom - prcNewWindow->top,
+		SWP_NOZORDER | SWP_NOACTIVATE);
+
+	log(StrF(_T("CEditFrameWnd::OnDpiChanged dpi: %d width: %d, height: %d"), dpi, (prcNewWindow->right - prcNewWindow->left), (prcNewWindow->bottom - prcNewWindow->top)));
+
+	this->Invalidate();
+	this->UpdateWindow();
+
+	return TRUE;
+}
+
+void CEditFrameWnd::OnMoving(UINT fwSide, LPRECT pRect)
+{
+	CWnd::OnMoving(fwSide, pRect);
+	m_snap.OnSnapMoving(m_hWnd, pRect);
+}
+
+void CEditFrameWnd::OnEnterSizeMove()
+{
+	m_snap.OnSnapEnterSizeMove(m_hWnd);
+	CWnd::OnEnterSizeMove();
 }

QPasteWnd.cpp

@@ -6813,7 +6813,10 @@ LRESULT CQPasteWnd::OnDpiChanged(WPARAM wParam, LPARAM lParam)
 	{
 		EnsureWindowVisible(&r);
 	}
+
 	SetWindowPos(NULL, r.left, r.top, r.Width(), r.Height(), SWP_NOZORDER | SWP_NOACTIVATE);
+
+	log(StrF(_T("CQPasteWnd::OnDpiChanged dpi: %d width: %d, height: %d"), dpi, r.Width(), r.Height()));
 	
 	m_systemMenu.Reset();
 	m_systemMenu.LoadStdImageDPI(m_DittoWindow.m_dpi.GetDPI(), system_menu_2_24, system_menu_2_30, system_menu_2_36, system_menu_2_42, system_menu_2_48, _T("PNG"), system_menu_54, system_menu_60, system_menu_66, system_menu_72, system_menu_78, system_menu_84);

QRCodeViewer.cpp

@@ -1,318 +1,320 @@
-// QRCodeViewer.cpp : implementation file
-//
-
-#include "stdafx.h"
-#include "CP_Main.h"
-#include "QRCodeViewer.h"
-#include "MainTableFunctions.h"
-
-#define TIMER_BUTTON_UP 1
-
-// QRCodeViewer
-
-IMPLEMENT_DYNAMIC(QRCodeViewer, CWnd)
-
-QRCodeViewer::QRCodeViewer()
-{
-	m_descBackground = NULL;
-
-}
-
-QRCodeViewer::~QRCodeViewer()
-{
-	if(m_descBackground != NULL)
-	{
-		DeleteObject(m_descBackground);
-	}
-}
-
-BEGIN_MESSAGE_MAP(QRCodeViewer, CWnd)
-	ON_WM_CREATE()
-	ON_WM_PAINT()
-	ON_WM_SIZE()
-	ON_WM_NCHITTEST()
-	ON_WM_NCPAINT()
-	ON_WM_NCCALCSIZE()
-	ON_WM_NCLBUTTONDOWN()
-	ON_WM_NCMOUSEMOVE()
-	ON_WM_NCLBUTTONUP()
-	ON_WM_ERASEBKGND()
-	ON_WM_CTLCOLOR()
-	ON_WM_WINDOWPOSCHANGING()
-	ON_WM_TIMER()
-	ON_MESSAGE(WM_DPICHANGED, OnDpiChanged)
-	ON_WM_MOVING()
-	ON_WM_ENTERSIZEMOVE()
-END_MESSAGE_MAP()
-
-
-BOOL QRCodeViewer::CreateEx(CWnd *pParentWnd, unsigned char* bitmapData, int imageSize, CString desc, int rowHeight, LOGFONT logFont)
-{
-	// Get the class name and create the window
-	CString szClassName = AfxRegisterWndClass(CS_CLASSDC | CS_SAVEBITS, LoadCursor(NULL, IDC_ARROW));
-
-	m_bitmapData = bitmapData;
-	m_imageSize = imageSize;
-	m_descRowHeight = rowHeight;
-	m_descBackground = CreateSolidBrush(RGB(255, 255, 255));
-	m_logFont = logFont;
-	m_originalFontHeight = logFont.lfHeight;
-
-	if(CWnd::CreateEx(0, szClassName, _T(""), WS_POPUP, 0, 0, 0, 0, NULL, 0, NULL))
-	{	
-		BOOL r = m_desc.Create(CMainTableFunctions::GetDisplayText(g_Opt.m_nLinesPerRow, desc), WS_CHILD|WS_VISIBLE, CRect(0,0,0,0), this, 2);
-
-		m_font.CreateFontIndirect(&logFont);
-		m_desc.SetFont(&m_font);	
-
-		m_DittoWindow.DoCreate(this);
-		m_DittoWindow.SetCaptionColors(g_Opt.m_Theme.CaptionLeft(), g_Opt.m_Theme.CaptionRight(), g_Opt.m_Theme.Border());
-		m_DittoWindow.SetCaptionOn(this, CGetSetOptions::GetCaptionPos(), true, g_Opt.m_Theme.GetCaptionSize(), g_Opt.m_Theme.GetCaptionFontSize());
-		m_DittoWindow.m_bDrawMinimize = false;
-		m_DittoWindow.m_bDrawMaximize = true;
-		m_DittoWindow.m_bDrawChevron = false;
-		m_DittoWindow.m_sendWMClose = false;
-
-		m_qrCodeDrawer.LoadRaw(m_bitmapData, m_imageSize);
-
-		delete[] m_bitmapData;
-
-		CRect parentRect;
-		pParentWnd->GetWindowRect(&parentRect);
-
-		CRect rect;
-		rect.left = parentRect.left;
-		rect.top = parentRect.top;
-
-		rect.right = rect.left + m_DittoWindow.m_borderSize + m_DittoWindow.m_borderSize + m_qrCodeDrawer.ImageWidth() + (CGetSetOptions::GetQRCodeBorderPixels() * 2);
-		if (m_DittoWindow.m_captionPosition == CAPTION_LEFT ||
-			m_DittoWindow.m_captionPosition == CAPTION_RIGHT)
-		{
-			rect.right += m_DittoWindow.m_captionBorderWidth;
-		}
-		rect.bottom = rect.top + m_DittoWindow.m_borderSize + m_DittoWindow.m_borderSize + rowHeight + 5 + m_qrCodeDrawer.ImageHeight() + (CGetSetOptions::GetQRCodeBorderPixels() * 2);
-		
-		CRect center = CenterRect(rect);
-
-		EnsureWindowVisible(&center);
-
-		::MoveWindow(m_hWnd, center.left, center.top, center.Width(), center.Height(), TRUE);
-
-		MoveControls();
-
-		SetFocus();
-	}
-	else
-	{
-		delete[] m_bitmapData;
-	}
-
-	return TRUE;
-}
-
-void QRCodeViewer::OnSize(UINT nType, int cx, int cy)
-{
-	CWnd::OnSize(nType, cx, cy);
-
-	this->Invalidate();
-
-	MoveControls();
-}
-
-void QRCodeViewer::MoveControls()
-{
-	CRect crRect;
-	GetClientRect(crRect);
-	int cx = crRect.Width();
-	int cy = crRect.Height();
-
-	if(m_desc.m_hWnd != NULL)
-	{
-		m_desc.MoveWindow(m_DittoWindow.m_dpi.Scale(5), cy - m_DittoWindow.m_dpi.Scale(m_descRowHeight) - m_DittoWindow.m_dpi.Scale(5), cx - m_DittoWindow.m_dpi.Scale(10), m_DittoWindow.m_dpi.Scale(m_descRowHeight));
-	}
-}
-
-void QRCodeViewer::OnPaint()
-{
-	CPaintDC dc(this);
-
-	CRect thisRect;
-	GetClientRect(thisRect);
-	thisRect.bottom -= m_DittoWindow.m_dpi.Scale(m_descRowHeight) - m_DittoWindow.m_dpi.Scale(5);
-	
-	int width = thisRect.Width() - (CGetSetOptions::GetQRCodeBorderPixels() * 2);
-	int height = min(width, (thisRect.Height() - (CGetSetOptions::GetQRCodeBorderPixels() * 2)));
-	width = min(width, height);
-		
-	CRect imageRect(0, 0, width, height);
-
-	CRect centerRect = CenterRectFromRect(imageRect, thisRect);
-
-	m_qrCodeDrawer.Draw(&dc, m_DittoWindow.m_dpi, this, centerRect.left, centerRect.top, false, false, width, height);
-}
-
-BOOL QRCodeViewer::PreTranslateMessage(MSG *pMsg)
-{
-	m_DittoWindow.DoPreTranslateMessage(pMsg);
-
-	switch(pMsg->message)
-	{
-	case WM_KEYDOWN:
-
-		switch(pMsg->wParam)
-		{
-		case VK_ESCAPE:
-			::SendMessage(m_hWnd, WM_CLOSE, 0, 0);
-			return TRUE;
-		}
-	}
-
-	return CWnd::PreTranslateMessage(pMsg);
-}
-	
-void QRCodeViewer::PostNcDestroy()
-{
-    CWnd::PostNcDestroy();
-
-    delete this;
-}
-
-void QRCodeViewer::OnNcPaint()
-{
-	m_DittoWindow.DoNcPaint(this);
-}
-
-void QRCodeViewer::OnNcCalcSize(BOOL bCalcValidRects, NCCALCSIZE_PARAMS FAR* lpncsp) 
-{
-	CWnd::OnNcCalcSize(bCalcValidRects, lpncsp);
-
-	m_DittoWindow.DoNcCalcSize(bCalcValidRects, lpncsp);
-}
-
-HITTEST_RET QRCodeViewer::OnNcHitTest(CPoint point) 
-{
-	UINT Ret = m_DittoWindow.DoNcHitTest(this, point);
-	if(Ret == -1)
-		return CWnd::OnNcHitTest(point);
-
-	return Ret;
-}
-
-BOOL QRCodeViewer::OnEraseBkgnd(CDC* pDC) 
-{
-	CRect rect;
-	GetClientRect(&rect);
-	CBrush myBrush(RGB(255, 255, 255));
-	CBrush *pOld = pDC->SelectObject(&myBrush);
-	BOOL bRes  = pDC->PatBlt(0, 0, rect.Width(), rect.Height(), PATCOPY);
-	pDC->SelectObject(pOld);
-
-	return TRUE;
-}
-
-void QRCodeViewer::OnNcLButtonDown(UINT nHitTest, CPoint point) 
-{
-	int buttonPressed = m_DittoWindow.DoNcLButtonDown(this, nHitTest, point);
-
-	if (buttonPressed != 0)
-	{
-		SetTimer(TIMER_BUTTON_UP, 100, NULL);
-	}
-
-	CWnd::OnNcLButtonDown(nHitTest, point);
-}
-
-void QRCodeViewer::OnNcLButtonUp(UINT nHitTest, CPoint point) 
-{
-	long lRet = m_DittoWindow.DoNcLButtonUp(this, nHitTest, point);
-
-	switch(lRet)
-	{
-	case BUTTON_CLOSE:
-		::PostMessage(m_hWnd, WM_CLOSE, 0, 0);
-		break;
-	}
-
-	KillTimer(TIMER_BUTTON_UP);
-
-	CWnd::OnNcLButtonUp(nHitTest, point);
-}
-
-void QRCodeViewer::OnNcMouseMove(UINT nHitTest, CPoint point) 
-{
-	m_DittoWindow.DoNcMouseMove(this, nHitTest, point);
-
-	CWnd::OnNcMouseMove(nHitTest, point);
-}
-
-HBRUSH QRCodeViewer::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)
-{
-	HBRUSH hbr = CWnd::OnCtlColor(pDC, pWnd, nCtlColor);
-	if(pWnd->GetDlgCtrlID() == 2)
-	{
-		pDC->SetBkColor(RGB(255,255,255));
-
-		return m_descBackground;
-	}
-
-	// TODO:  Return a different brush if the default is not desired
-	return hbr;
-}
-void QRCodeViewer::OnWindowPosChanging(WINDOWPOS* lpwndpos)
-{
-	CWnd::OnWindowPosChanging(lpwndpos);
-}
-
-void QRCodeViewer::OnTimer(UINT_PTR nIDEvent)
-{
-	switch (nIDEvent)
-	{
-		case TIMER_BUTTON_UP:
-		{
-			if ((GetKeyState(VK_LBUTTON) & 0x100) == 0)
-			{
-				m_DittoWindow.DoNcLButtonUp(this, 0, CPoint(0, 0));
-				KillTimer(TIMER_BUTTON_UP);
-			}
-			break;
-		}
-	}
-
-	CWnd::OnTimer(nIDEvent);
-}
-
-LRESULT QRCodeViewer::OnDpiChanged(WPARAM wParam, LPARAM lParam)
-{
-	int dpi = HIWORD(wParam);
-	m_DittoWindow.OnDpiChanged(this, dpi);
-
-	RECT* const prcNewWindow = (RECT*)lParam;
-	SetWindowPos(NULL,
-		prcNewWindow->left,
-		prcNewWindow->top,
-		prcNewWindow->right - prcNewWindow->left,
-		prcNewWindow->bottom - prcNewWindow->top,
-		SWP_NOZORDER | SWP_NOACTIVATE);
-
-	MoveControls();
-
-	m_logFont.lfHeight = m_DittoWindow.m_dpi.Scale(m_originalFontHeight);
-
-	m_font.Detach();
-	m_font.CreateFontIndirect(&m_logFont);
-	m_desc.SetFont(&m_font);
-
-	return TRUE;
-}
-
-void QRCodeViewer::OnMoving(UINT fwSide, LPRECT pRect)
-{
-	CWnd::OnMoving(fwSide, pRect);
-	m_snap.OnSnapMoving(m_hWnd, pRect);
-}
-
-void QRCodeViewer::OnEnterSizeMove()
-{
-	m_snap.OnSnapEnterSizeMove(m_hWnd);
-	CWnd::OnEnterSizeMove();
+// QRCodeViewer.cpp : implementation file
+//
+
+#include "stdafx.h"
+#include "CP_Main.h"
+#include "QRCodeViewer.h"
+#include "MainTableFunctions.h"
+
+#define TIMER_BUTTON_UP 1
+
+// QRCodeViewer
+
+IMPLEMENT_DYNAMIC(QRCodeViewer, CWnd)
+
+QRCodeViewer::QRCodeViewer()
+{
+	m_descBackground = NULL;
+
+}
+
+QRCodeViewer::~QRCodeViewer()
+{
+	if(m_descBackground != NULL)
+	{
+		DeleteObject(m_descBackground);
+	}
+}
+
+BEGIN_MESSAGE_MAP(QRCodeViewer, CWnd)
+	ON_WM_CREATE()
+	ON_WM_PAINT()
+	ON_WM_SIZE()
+	ON_WM_NCHITTEST()
+	ON_WM_NCPAINT()
+	ON_WM_NCCALCSIZE()
+	ON_WM_NCLBUTTONDOWN()
+	ON_WM_NCMOUSEMOVE()
+	ON_WM_NCLBUTTONUP()
+	ON_WM_ERASEBKGND()
+	ON_WM_CTLCOLOR()
+	ON_WM_WINDOWPOSCHANGING()
+	ON_WM_TIMER()
+	ON_MESSAGE(WM_DPICHANGED, OnDpiChanged)
+	ON_WM_MOVING()
+	ON_WM_ENTERSIZEMOVE()
+END_MESSAGE_MAP()
+
+
+BOOL QRCodeViewer::CreateEx(CWnd *pParentWnd, unsigned char* bitmapData, int imageSize, CString desc, int rowHeight, LOGFONT logFont)
+{
+	// Get the class name and create the window
+	CString szClassName = AfxRegisterWndClass(CS_CLASSDC | CS_SAVEBITS, LoadCursor(NULL, IDC_ARROW));
+
+	m_bitmapData = bitmapData;
+	m_imageSize = imageSize;
+	m_descRowHeight = rowHeight;
+	m_descBackground = CreateSolidBrush(RGB(255, 255, 255));
+	m_logFont = logFont;
+	m_originalFontHeight = logFont.lfHeight;
+
+	if(CWnd::CreateEx(0, szClassName, _T(""), WS_POPUP, 0, 0, 0, 0, NULL, 0, NULL))
+	{	
+		BOOL r = m_desc.Create(CMainTableFunctions::GetDisplayText(g_Opt.m_nLinesPerRow, desc), WS_CHILD|WS_VISIBLE, CRect(0,0,0,0), this, 2);
+
+		m_font.CreateFontIndirect(&logFont);
+		m_desc.SetFont(&m_font);	
+
+		m_DittoWindow.DoCreate(this);
+		m_DittoWindow.SetCaptionColors(g_Opt.m_Theme.CaptionLeft(), g_Opt.m_Theme.CaptionRight(), g_Opt.m_Theme.Border());
+		m_DittoWindow.SetCaptionOn(this, CGetSetOptions::GetCaptionPos(), true, g_Opt.m_Theme.GetCaptionSize(), g_Opt.m_Theme.GetCaptionFontSize());
+		m_DittoWindow.m_bDrawMinimize = false;
+		m_DittoWindow.m_bDrawMaximize = true;
+		m_DittoWindow.m_bDrawChevron = false;
+		m_DittoWindow.m_sendWMClose = false;
+
+		m_qrCodeDrawer.LoadRaw(m_bitmapData, m_imageSize);
+
+		delete[] m_bitmapData;
+
+		CRect parentRect;
+		pParentWnd->GetWindowRect(&parentRect);
+
+		CRect rect;
+		rect.left = parentRect.left;
+		rect.top = parentRect.top;
+
+		rect.right = rect.left + m_DittoWindow.m_borderSize + m_DittoWindow.m_borderSize + m_qrCodeDrawer.ImageWidth() + (CGetSetOptions::GetQRCodeBorderPixels() * 2);
+		if (m_DittoWindow.m_captionPosition == CAPTION_LEFT ||
+			m_DittoWindow.m_captionPosition == CAPTION_RIGHT)
+		{
+			rect.right += m_DittoWindow.m_captionBorderWidth;
+		}
+		rect.bottom = rect.top + m_DittoWindow.m_borderSize + m_DittoWindow.m_borderSize + rowHeight + 5 + m_qrCodeDrawer.ImageHeight() + (CGetSetOptions::GetQRCodeBorderPixels() * 2);
+		
+		CRect center = CenterRect(rect);
+
+		EnsureWindowVisible(&center);
+
+		::MoveWindow(m_hWnd, center.left, center.top, center.Width(), center.Height(), TRUE);
+
+		MoveControls();
+
+		SetFocus();
+	}
+	else
+	{
+		delete[] m_bitmapData;
+	}
+
+	return TRUE;
+}
+
+void QRCodeViewer::OnSize(UINT nType, int cx, int cy)
+{
+	CWnd::OnSize(nType, cx, cy);
+
+	this->Invalidate();
+
+	MoveControls();
+}
+
+void QRCodeViewer::MoveControls()
+{
+	CRect crRect;
+	GetClientRect(crRect);
+	int cx = crRect.Width();
+	int cy = crRect.Height();
+
+	if(m_desc.m_hWnd != NULL)
+	{
+		m_desc.MoveWindow(m_DittoWindow.m_dpi.Scale(5), cy - m_DittoWindow.m_dpi.Scale(m_descRowHeight) - m_DittoWindow.m_dpi.Scale(5), cx - m_DittoWindow.m_dpi.Scale(10), m_DittoWindow.m_dpi.Scale(m_descRowHeight));
+	}
+}
+
+void QRCodeViewer::OnPaint()
+{
+	CPaintDC dc(this);
+
+	CRect thisRect;
+	GetClientRect(thisRect);
+	thisRect.bottom -= m_DittoWindow.m_dpi.Scale(m_descRowHeight) - m_DittoWindow.m_dpi.Scale(5);
+	
+	int width = thisRect.Width() - (CGetSetOptions::GetQRCodeBorderPixels() * 2);
+	int height = min(width, (thisRect.Height() - (CGetSetOptions::GetQRCodeBorderPixels() * 2)));
+	width = min(width, height);
+		
+	CRect imageRect(0, 0, width, height);
+
+	CRect centerRect = CenterRectFromRect(imageRect, thisRect);
+
+	m_qrCodeDrawer.Draw(&dc, m_DittoWindow.m_dpi, this, centerRect.left, centerRect.top, false, false, width, height);
+}
+
+BOOL QRCodeViewer::PreTranslateMessage(MSG *pMsg)
+{
+	m_DittoWindow.DoPreTranslateMessage(pMsg);
+
+	switch(pMsg->message)
+	{
+	case WM_KEYDOWN:
+
+		switch(pMsg->wParam)
+		{
+		case VK_ESCAPE:
+			::SendMessage(m_hWnd, WM_CLOSE, 0, 0);
+			return TRUE;
+		}
+	}
+
+	return CWnd::PreTranslateMessage(pMsg);
+}
+	
+void QRCodeViewer::PostNcDestroy()
+{
+    CWnd::PostNcDestroy();
+
+    delete this;
+}
+
+void QRCodeViewer::OnNcPaint()
+{
+	m_DittoWindow.DoNcPaint(this);
+}
+
+void QRCodeViewer::OnNcCalcSize(BOOL bCalcValidRects, NCCALCSIZE_PARAMS FAR* lpncsp) 
+{
+	CWnd::OnNcCalcSize(bCalcValidRects, lpncsp);
+
+	m_DittoWindow.DoNcCalcSize(bCalcValidRects, lpncsp);
+}
+
+HITTEST_RET QRCodeViewer::OnNcHitTest(CPoint point) 
+{
+	UINT Ret = m_DittoWindow.DoNcHitTest(this, point);
+	if(Ret == -1)
+		return CWnd::OnNcHitTest(point);
+
+	return Ret;
+}
+
+BOOL QRCodeViewer::OnEraseBkgnd(CDC* pDC) 
+{
+	CRect rect;
+	GetClientRect(&rect);
+	CBrush myBrush(RGB(255, 255, 255));
+	CBrush *pOld = pDC->SelectObject(&myBrush);
+	BOOL bRes  = pDC->PatBlt(0, 0, rect.Width(), rect.Height(), PATCOPY);
+	pDC->SelectObject(pOld);
+
+	return TRUE;
+}
+
+void QRCodeViewer::OnNcLButtonDown(UINT nHitTest, CPoint point) 
+{
+	int buttonPressed = m_DittoWindow.DoNcLButtonDown(this, nHitTest, point);
+
+	if (buttonPressed != 0)
+	{
+		SetTimer(TIMER_BUTTON_UP, 100, NULL);
+	}
+
+	CWnd::OnNcLButtonDown(nHitTest, point);
+}
+
+void QRCodeViewer::OnNcLButtonUp(UINT nHitTest, CPoint point) 
+{
+	long lRet = m_DittoWindow.DoNcLButtonUp(this, nHitTest, point);
+
+	switch(lRet)
+	{
+	case BUTTON_CLOSE:
+		::PostMessage(m_hWnd, WM_CLOSE, 0, 0);
+		break;
+	}
+
+	KillTimer(TIMER_BUTTON_UP);
+
+	CWnd::OnNcLButtonUp(nHitTest, point);
+}
+
+void QRCodeViewer::OnNcMouseMove(UINT nHitTest, CPoint point) 
+{
+	m_DittoWindow.DoNcMouseMove(this, nHitTest, point);
+
+	CWnd::OnNcMouseMove(nHitTest, point);
+}
+
+HBRUSH QRCodeViewer::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)
+{
+	HBRUSH hbr = CWnd::OnCtlColor(pDC, pWnd, nCtlColor);
+	if(pWnd->GetDlgCtrlID() == 2)
+	{
+		pDC->SetBkColor(RGB(255,255,255));
+
+		return m_descBackground;
+	}
+
+	// TODO:  Return a different brush if the default is not desired
+	return hbr;
+}
+void QRCodeViewer::OnWindowPosChanging(WINDOWPOS* lpwndpos)
+{
+	CWnd::OnWindowPosChanging(lpwndpos);
+}
+
+void QRCodeViewer::OnTimer(UINT_PTR nIDEvent)
+{
+	switch (nIDEvent)
+	{
+		case TIMER_BUTTON_UP:
+		{
+			if ((GetKeyState(VK_LBUTTON) & 0x100) == 0)
+			{
+				m_DittoWindow.DoNcLButtonUp(this, 0, CPoint(0, 0));
+				KillTimer(TIMER_BUTTON_UP);
+			}
+			break;
+		}
+	}
+
+	CWnd::OnTimer(nIDEvent);
+}
+
+LRESULT QRCodeViewer::OnDpiChanged(WPARAM wParam, LPARAM lParam)
+{
+	int dpi = HIWORD(wParam);
+	m_DittoWindow.OnDpiChanged(this, dpi);
+
+	RECT* const prcNewWindow = (RECT*)lParam;
+	SetWindowPos(NULL,
+		prcNewWindow->left,
+		prcNewWindow->top,
+		prcNewWindow->right - prcNewWindow->left,
+		prcNewWindow->bottom - prcNewWindow->top,
+		SWP_NOZORDER | SWP_NOACTIVATE);
+
+	log(StrF(_T("QRCodeViewer::OnDpiChanged dpi: %d width: %d, height: %d"), dpi, (prcNewWindow->right - prcNewWindow->left), (prcNewWindow->bottom - prcNewWindow->top)));
+
+	MoveControls();
+
+	m_logFont.lfHeight = m_DittoWindow.m_dpi.Scale(m_originalFontHeight);
+
+	m_font.Detach();
+	m_font.CreateFontIndirect(&m_logFont);
+	m_desc.SetFont(&m_font);
+
+	return TRUE;
+}
+
+void QRCodeViewer::OnMoving(UINT fwSide, LPRECT pRect)
+{
+	CWnd::OnMoving(fwSide, pRect);
+	m_snap.OnSnapMoving(m_hWnd, pRect);
+}
+
+void QRCodeViewer::OnEnterSizeMove()
+{
+	m_snap.OnSnapEnterSizeMove(m_hWnd);
+	CWnd::OnEnterSizeMove();
 }

ToolTipEx.cpp

@@ -1387,6 +1387,8 @@ LRESULT CToolTipEx::OnDpiChanged(WPARAM wParam, LPARAM lParam)
 		prcNewWindow->bottom - prcNewWindow->top,
 		SWP_NOZORDER | SWP_NOACTIVATE);
 
+	log(StrF(_T("CQPasteWnd::OnDpiChanged dpi: %d width: %d, height: %d"), dpi, (prcNewWindow->right - prcNewWindow->left), (prcNewWindow->bottom - prcNewWindow->top)));
+
 	m_optionsButton.Reset();
 	m_optionsButton.LoadStdImageDPI(m_DittoWindow.m_dpi.GetDPI(), IDB_COG_16_16, IDB_COG_20_20, IDB_COG_24_24, cog_28, IDB_COG_32_32, _T("PNG"));