[Amis-vcs] SF.net SVN: amis: [2429] branches/amis3/AmisGuiMFC2
Brought to you by:
julienq,
marisademeglio
From: <mar...@us...> - 2008-03-18 05:38:30
|
Revision: 2429 http://amis.svn.sourceforge.net/amis/?rev=2429&view=rev Author: marisademeglio Date: 2008-03-17 22:38:31 -0700 (Mon, 17 Mar 2008) Log Message: ----------- some more improvements to HTML view sizing. it responds to changes in the main window, but stylesheets still look a bit funny Modified Paths: -------------- branches/amis3/AmisGuiMFC2/include/gui/MainFrm.h branches/amis3/AmisGuiMFC2/src/gui/HtmlView.cpp branches/amis3/AmisGuiMFC2/src/gui/MainFrm.cpp branches/amis3/AmisGuiMFC2/src/gui/MmView.cpp Modified: branches/amis3/AmisGuiMFC2/include/gui/MainFrm.h =================================================================== --- branches/amis3/AmisGuiMFC2/include/gui/MainFrm.h 2008-03-18 05:32:42 UTC (rev 2428) +++ branches/amis3/AmisGuiMFC2/include/gui/MainFrm.h 2008-03-18 05:38:31 UTC (rev 2429) @@ -92,6 +92,7 @@ void updateUiCommandState(CCmdUI*, bool); public: virtual void RecalcLayout(BOOL bNotify = TRUE); + afx_msg void OnSize(UINT nType, int cx, int cy); }; } } Modified: branches/amis3/AmisGuiMFC2/src/gui/HtmlView.cpp =================================================================== --- branches/amis3/AmisGuiMFC2/src/gui/HtmlView.cpp 2008-03-18 05:32:42 UTC (rev 2428) +++ branches/amis3/AmisGuiMFC2/src/gui/HtmlView.cpp 2008-03-18 05:38:31 UTC (rev 2429) @@ -628,6 +628,11 @@ //stylesheet doesn't override the default styling (i would like it to override this) res = pDoc->createStyleSheet(css_path_bstr, 0, &pStyleSheet); SysFreeString(css_path_bstr); + //without this line, the stylesheet gets a weird leftover border from the previous style + //it still happens sometimes though + //if you move the window or scroll, the weird border goes away + MainWndParts::Instance()->mpMainFrame->ShowWindow(SW_SHOWNA); + return pStyleSheet; } Modified: branches/amis3/AmisGuiMFC2/src/gui/MainFrm.cpp =================================================================== --- branches/amis3/AmisGuiMFC2/src/gui/MainFrm.cpp 2008-03-18 05:32:42 UTC (rev 2428) +++ branches/amis3/AmisGuiMFC2/src/gui/MainFrm.cpp 2008-03-18 05:38:31 UTC (rev 2429) @@ -98,6 +98,7 @@ ON_UPDATE_COMMAND_UI_RANGE(AMIS_BOOKMARKS_BASE_ID, AMIS_BOOKMARKS_BASE_ID + AMIS_MAX_ANYTHING, OnUpdateCmdUiGeneral) //}}AFX_MSG_MAP ON_WM_SIZE() + ON_WM_SIZE() END_MESSAGE_MAP() static UINT indicators[] = @@ -672,3 +673,16 @@ CMDIFrameWnd::RecalcLayout(bNotify); } + +void amis::gui::CMainFrame::OnSize(UINT nType, int cx, int cy) +{ + CMDIFrameWnd::OnSize(nType, cx, cy); + if (MainWndParts::Instance()->mpMmView != NULL) + { + //CRect sr; + //CRect r; + //this->GetWindowRect(&r); + //MainWndParts::Instance()->mpSidebar->GetWindowRect(&sr); + MainWndParts::Instance()->mpMmView->OnSize(nType, cx, cy); + } +} Modified: branches/amis3/AmisGuiMFC2/src/gui/MmView.cpp =================================================================== --- branches/amis3/AmisGuiMFC2/src/gui/MmView.cpp 2008-03-18 05:32:42 UTC (rev 2428) +++ branches/amis3/AmisGuiMFC2/src/gui/MmView.cpp 2008-03-18 05:38:31 UTC (rev 2429) @@ -541,7 +541,7 @@ mainWnd->SetWindowPos(&wndTop, 0, 0, size.cx, size.cy, flags); return 0; } -//TODO: why does this code never get called?? + void MmView::OnSize(UINT nType, int cx, int cy) { CView::OnSize(nType, cx, cy); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |