Changeset 361 for branches/highdpi/Packages/CevoComponents/BaseWin.pas

Timestamp:

Apr 9, 2021, 5:56:50 PM (3 years ago)

Author:

chronos

Message:

• Modified: Merged changes from trunk r360 into highdpi branch.

File:

• branches/highdpi/Packages/CevoComponents/BaseWin.pas (modified) (10 diffs)

branches/highdpi/Packages/CevoComponents/BaseWin.pas

@@ -292 +292 @@
   procedure CornerFrame(x0, y0, x1, y1: integer);
   begin
-    Frame(Canvas, x0 + 1, y0 + 1, x1 - 2, y1 - 2, MainTexture.clBevelLight,
-      MainTexture.clBevelShade);
-    Frame(Canvas, x0 + 2, y0 + 2, x1 - 3, y1 - 3, MainTexture.clBevelLight,
-      MainTexture.clBevelShade);
+    Frame(Canvas, x0 + 1, y0 + 1, x1 - 2, y1 - 2, MainTexture.ColorBevelLight,
+      MainTexture.ColorBevelShade);
+    Frame(Canvas, x0 + 2, y0 + 2, x1 - 3, y1 - 3, MainTexture.ColorBevelLight,
+      MainTexture.ColorBevelShade);
     Corner(Canvas, x0 + 1, y0 + 1, 0, MainTexture);
     Corner(Canvas, x1 - 9, y0 + 1, 1, MainTexture);
@@ -318 +318 @@
   l := BiColorTextWidth(Canvas, Caption);
   Cut := (ClientWidth - l) div 2;
-  xTexOffset := (wMaintexture - ClientWidth) div 2;
-  yTexOffset := (hMaintexture - ClientHeight) div 2;
+  xTexOffset := (Maintexture.Width - ClientWidth) div 2;
+  yTexOffset := (Maintexture.Height - ClientHeight) div 2;
   if WideBottom then
     InnerBottom := ClientHeight - WideFrame
@@ -345 +345 @@
   Frame(Canvas, 0, FrameTop, ClientWidth - 1, FrameBottom - 1, 0, 0);
   Frame(Canvas, SideFrame - 1, TitleHeight - 1, ClientWidth - SideFrame,
-    InnerBottom, MainTexture.clBevelShade, MainTexture.clBevelLight);
+    InnerBottom, MainTexture.ColorBevelShade, MainTexture.ColorBevelLight);
   // RFrame(Canvas,SideFrame-2,TitleHeight-2,ClientWidth-SideFrame+1,
-  // InnerBottom+1,MainTexture.clBevelShade,MainTexture.clBevelLight);
+  // InnerBottom+1,MainTexture.ColorBevelShade,MainTexture.ColorBevelLight);
   if FullCaption then
   begin
@@ -367 +367 @@
           4, xTexOffset, yTexOffset);
         CornerFrame(0, FrameTop, ClientWidth, FrameBottom);
-        Pen.Color := MainTexture.clBevelShade;
+        Pen.Color := MainTexture.ColorBevelShade;
         MoveTo(3 + ModalFrameIndent, 2);
         LineTo(3 + ModalFrameIndent, TitleHeight);
-        Pen.Color := MainTexture.clBevelShade;
+        Pen.Color := MainTexture.ColorBevelShade;
         MoveTo(4 + ModalFrameIndent, TitleHeight - 1);
         LineTo(ClientWidth - 4 - ModalFrameIndent, TitleHeight - 1);
         LineTo(ClientWidth - 4 - ModalFrameIndent, 1);
-        Pen.Color := MainTexture.clBevelLight;
+        Pen.Color := MainTexture.ColorBevelLight;
         MoveTo(ClientWidth - 5 - ModalFrameIndent, 2);
         LineTo(4 + ModalFrameIndent, 2);
@@ -380 +380 @@
         MoveTo(ClientWidth - 4 - ModalFrameIndent, 1);
         LineTo(3 + ModalFrameIndent, 1);
-        Pen.Color := MainTexture.clBevelLight;
+        Pen.Color := MainTexture.ColorBevelLight;
         MoveTo(ClientWidth - 3 - ModalFrameIndent, 3);
         LineTo(ClientWidth - 3 - ModalFrameIndent, TitleHeight);
@@ -397 +397 @@
 
     Frame(Canvas, CaptionLeft + 1, 0 + 1, ClientWidth - CaptionLeft - 2,
-      TitleHeight - 1, MainTexture.clBevelLight, MainTexture.clBevelShade);
+      TitleHeight - 1, MainTexture.ColorBevelLight, MainTexture.ColorBevelShade);
     Frame(Canvas, CaptionLeft + 2, 0 + 2, ClientWidth - CaptionLeft - 3,
-      TitleHeight - 1, MainTexture.clBevelLight, MainTexture.clBevelShade);
+      TitleHeight - 1, MainTexture.ColorBevelLight, MainTexture.ColorBevelShade);
     Corner(Canvas, CaptionLeft + 1, 0 + 1, 0, MainTexture);
     Corner(Canvas, ClientWidth - CaptionLeft - 9, 0 + 1, 1, MainTexture);
@@ -405 +405 @@
     with Canvas do
     begin
-      Pen.Color := MainTexture.clBevelShade;
+      Pen.Color := MainTexture.ColorBevelShade;
       MoveTo(CaptionLeft + 1, FrameTop + 2);
       LineTo(CaptionLeft + 1, TitleHeight);
-      Pen.Color := MainTexture.clBevelLight;
+      Pen.Color := MainTexture.ColorBevelLight;
       MoveTo(ClientWidth - CaptionLeft - 2, FrameTop + 2);
       LineTo(ClientWidth - CaptionLeft - 2, TitleHeight);
@@ -421 +421 @@
       Frame(Canvas, CaptionLeft + 1, ClientHeight - WideFrame - 1 + 1,
         ClientWidth - CaptionLeft - 2, ClientHeight - 2,
-        MainTexture.clBevelLight, MainTexture.clBevelShade);
+        MainTexture.ColorBevelLight, MainTexture.ColorBevelShade);
       Frame(Canvas, CaptionLeft + 2, ClientHeight - WideFrame - 1 + 1,
         ClientWidth - CaptionLeft - 3, ClientHeight - 3,
-        MainTexture.clBevelLight, MainTexture.clBevelShade);
+        MainTexture.ColorBevelLight, MainTexture.ColorBevelShade);
       Corner(Canvas, CaptionLeft + 1, ClientHeight - 9, 2, MainTexture);
       Corner(Canvas, ClientWidth - CaptionLeft - 9, ClientHeight - 9, 3,
@@ -431 +431 @@
       with Canvas do
       begin
-        Pen.Color := MainTexture.clBevelShade;
+        Pen.Color := MainTexture.ColorBevelShade;
         MoveTo(CaptionLeft + 1, ClientHeight - WideFrame);
         LineTo(CaptionLeft + 1, FrameBottom - 2);
-        Pen.Color := MainTexture.clBevelLight;
+        Pen.Color := MainTexture.ColorBevelLight;
         MoveTo(ClientWidth - CaptionLeft - 2, ClientHeight - WideFrame);
         LineTo(ClientWidth - CaptionLeft - 2, FrameBottom - 2);
@@ -486 +486 @@
 begin
   Fill(Offscreen.Canvas, Left, Top, Width, Height,
-    SideFrame + (wMaintexture - ClientWidth) div 2,
-    TitleHeight + (hMaintexture - ClientHeight) div 2);
+    SideFrame + (Maintexture.Width - ClientWidth) div 2,
+    TitleHeight + (Maintexture.Height - ClientHeight) div 2);
 end;