From 5753ba130a349487515330df7706e2d7d9955ad9 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Mon, 7 Nov 2011 16:31:38 +0000
Subject: [PATCH] ide: Copy File Path (RM #159), CtrlCore: Win32
 TopWindow::SerializePlacement improved (Thanks tom1)

git-svn-id: svn://ultimatepp.org/upp/trunk@4147 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/CtrlCore/TopWin32.cpp | 11 +++++++++++
 uppsrc/CtrlCore/init         |  2 +-
 uppsrc/ide/UppWspc.cpp       |  1 +
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/uppsrc/CtrlCore/TopWin32.cpp b/uppsrc/CtrlCore/TopWin32.cpp
index 9884f6fe9..c6e16bafe 100644
--- a/uppsrc/CtrlCore/TopWin32.cpp
+++ b/uppsrc/CtrlCore/TopWin32.cpp
@@ -369,6 +369,16 @@ void TopWindow::SerializePlacement(Stream& s, bool reminimize)
 		if(state == OVERLAPPED)
 			SetRect(rect);
 		if(IsOpen()) {
+			WINDOWPLACEMENT wp;
+			memset(&wp,0,sizeof(WINDOWPLACEMENT));
+			wp.length=sizeof(WINDOWPLACEMENT);
+			wp.showCmd = state==MINIMIZED ? SW_MINIMIZE : state==MAXIMIZED ? SW_MAXIMIZE : SW_RESTORE;
+			wp.rcNormalPosition.left=rect.left;
+			wp.rcNormalPosition.top=rect.top;
+			wp.rcNormalPosition.right=rect.right;
+			wp.rcNormalPosition.bottom=rect.bottom;
+			::SetWindowPlacement(GetHWND(),&wp);
+		/*
 			HWND hwnd = GetHWND();
 			switch(state) {
 			case MINIMIZED:
@@ -384,6 +394,7 @@ void TopWindow::SerializePlacement(Stream& s, bool reminimize)
 					::ShowWindow(hwnd, SW_RESTORE);
 				break;
 			}
+		*/
 		}
 	}
 #endif
diff --git a/uppsrc/CtrlCore/init b/uppsrc/CtrlCore/init
index 6b1b24017..cb2c82ff1 100644
--- a/uppsrc/CtrlCore/init
+++ b/uppsrc/CtrlCore/init
@@ -3,7 +3,7 @@
 #include "Draw/init"
 #include "plugin\bmp/init"
 #include "RichText/init"
-#define BLITZ_INDEX__ FFF939EA92921B74D64CBA4B691FBD637
+#define BLITZ_INDEX__ F6A8B66C284D5064504C666248075C21A
 #include "CtrlCore.icpp"
 #undef BLITZ_INDEX__
 #endif
diff --git a/uppsrc/ide/UppWspc.cpp b/uppsrc/ide/UppWspc.cpp
index 7642d10ea..fd1d74e2b 100644
--- a/uppsrc/ide/UppWspc.cpp
+++ b/uppsrc/ide/UppWspc.cpp
@@ -816,6 +816,7 @@ void WorkspaceWork::FileMenu(Bar& menu)
 		.Help("Remove file / topic group reference from package & delete file / folder on disk");
 	menu.Separator();
 	menu.Add("Open File Directory",THISBACK(OpenFileFolder));
+	menu.Add("Copy File Path", callback1(WriteClipboardText, GetActiveFilePath()));
 	menu.Separator();
 	menu.Add(filelist.GetCursor() > 0, "Move up", THISBACK1(MoveFile, -1))
 		.Key(organizer ? K_CTRL_UP : K_SHIFT_CTRL_UP)