From d79d2052a80f87f421ab2b20ebec1f34a367a866 Mon Sep 17 00:00:00 2001 From: cxl Date: Mon, 30 Jan 2012 16:22:01 +0000 Subject: [PATCH] Docking: fixed window title appearance bug git-svn-id: svn://ultimatepp.org/upp/trunk@4497 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/Docking/DockConfig.cpp | 3 +-- uppsrc/Docking/DockCont.cpp | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/uppsrc/Docking/DockConfig.cpp b/uppsrc/Docking/DockConfig.cpp index 859e95bec..915f57348 100644 --- a/uppsrc/Docking/DockConfig.cpp +++ b/uppsrc/Docking/DockConfig.cpp @@ -247,8 +247,7 @@ void DockConfigDlg::OnTreeDrag() { if (tree.GetCursor() >= 0 && tree.GetParent(tree.GetCursor()) == 0) return; - tree.DoDragAndDrop(InternalClip(tree, "dockwindowdrag"), - tree.GetDragSample(), DND_MOVE) == DND_MOVE; + tree.DoDragAndDrop(InternalClip(tree, "dockwindowdrag"), tree.GetDragSample(), DND_MOVE) == DND_MOVE; //?? } void DockConfigDlg::OnTreeDrop(int parent, int ii, PasteClip& d) diff --git a/uppsrc/Docking/DockCont.cpp b/uppsrc/Docking/DockCont.cpp index 80289e8f5..6ae866692 100644 --- a/uppsrc/Docking/DockCont.cpp +++ b/uppsrc/Docking/DockCont.cpp @@ -143,7 +143,7 @@ void ImgButton::Paint(Draw &w) // DockContHandle frame int DockCont::DockContHandle::GetHandleSize(const DockableCtrl::Style &s) const { - return (!IsNull(s.title_font) ? 12 : s.title_font.GetHeight()+4) + return (IsNull(s.title_font) ? 12 : s.title_font.GetHeight()+4) + (s.handle_vert ? s.handle_margins.GetWidth() : s.handle_margins.GetHeight()); } /*