Merge branch 'master' of github.com:pascalabcnet/pascalabcnet

Configuration/GlobalAssemblyInfo.cs

@@ -15,7 +15,7 @@ internal static class RevisionClass
 	public const string Major = "3";
 	public const string Minor = "5";
 	public const string Build = "1";
-	public const string Revision = "2254";
+	public const string Revision = "2255";
 
         public const string MainVersion = Major + "." + Minor;
 	public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;

Configuration/Version.defs

@@ -1,4 +1,4 @@
-%COREVERSION%=1
-%REVISION%=2254
 %MINOR%=5
+%REVISION%=2255
+%COREVERSION%=1
 %MAJOR%=3

Release/pabcversion.txt

@@ -1 +1 @@
-3.5.1.2254
+3.5.1.2255

ReleaseGenerators/PascalABCNET_version.nsh

@@ -1 +1 @@
-!define VERSION '3.5.1.2254'
+!define VERSION '3.5.1.2255'

bin/Lib/GraphWPFBase.pas

@@ -150,16 +150,39 @@ procedure WindowType.SetTop(t: real) := Invoke(WindowTypeSetTopP,t);
 function WindowTypeGetTopP := MainWindow.Top;
 function WindowType.GetTop := InvokeReal(WindowTypeGetTopP);
 
-procedure WindowTypeSetWidthP(w: real) := MainWindow.Width := w + wplus;
+procedure WindowTypeSetWidthP(w: real);
+begin
+  if MainWindow.ResizeMode = ResizeMode.NoResize then
+    MainWindow.Width := w + 2.5
+  else MainWindow.Width := w + wplus; 
+end;  
+  
 procedure WindowType.SetWidth(w: real) := Invoke(WindowTypeSetWidthP,w);
 
-function WindowTypeGetWidthP := MainWindow.ActualWidth - wplus;
+function WindowTypeGetWidthP: real;
+begin
+  if MainWindow.ResizeMode = ResizeMode.NoResize then
+    Result := MainWindow.ActualWidth - 2.5
+  else Result := MainWindow.ActualWidth - wplus; 
+end; 
 function WindowType.GetWidth := InvokeReal(WindowTypeGetWidthP);
 
-procedure WindowTypeSetHeightP(h: real) := MainWindow.Height := h + hplus;
+procedure WindowTypeSetHeightP(h: real);
+begin
+  if MainWindow.ResizeMode = ResizeMode.NoResize then
+    MainWindow.Height := h + SystemParameters.WindowCaptionHeight + 2.5
+  else MainWindow.Height := h + hplus;
+end;
 procedure WindowType.SetHeight(h: real) := Invoke(WindowTypeSetHeightP,h);
 
-function WindowTypeGetHeightP := MainWindow.ActualHeight - hplus;
+function WindowTypeGetHeightP: real;
+begin
+  if MainWindow.ResizeMode = ResizeMode.NoResize then
+    Result := MainWindow.ActualHeight - SystemParameters.WindowCaptionHeight - 2.5
+  else Result := MainWindow.ActualHeight - hplus;
+  Print(SystemParameters.FixedFrameHorizontalBorderHeight);
+  //Print(SystemParameters.WindowCaptionHeight, SystemParameters.WindowResizeBorderThickness.Top, SystemParameters.WindowResizeBorderThickness.Bottom);
+end; 
 function WindowType.GetHeight := InvokeReal(WindowTypeGetHeightP);
 
 procedure WindowTypeSetCaptionP(c: string) := MainWindow.Title := c;
@@ -168,7 +191,12 @@ procedure WindowType.SetCaption(c: string) := Invoke(WindowTypeSetCaptionP,c);
 function WindowTypeGetCaptionP := MainWindow.Title;
 function WindowType.GetCaption := Invoke&<string>(WindowTypeGetCaptionP);
 
-procedure WindowTypeSetFixedSizeP(b: boolean) := if b then MainWindow.ResizeMode := ResizeMode.NoResize else MainWindow.ResizeMode := ResizeMode.CanResize;
+procedure WindowTypeSetFixedSizeP(b: boolean);
+begin
+  if b then 
+    MainWindow.ResizeMode := ResizeMode.NoResize 
+  else MainWindow.ResizeMode := ResizeMode.CanResize;
+end;  
 procedure WindowType.SetFixedSize(b: boolean) := Invoke(WindowTypeSetFixedSizeP,b);
 
 function WindowTypeGetFixedSizeP := MainWindow.ResizeMode = ResizeMode.NoResize;