记事本界面布局调整，取消scaledlayout，消除字体变形问题

b9b989aa · cz_012273 · c6616ab3 · b9b989aa · b9b989aa · b9b989aa
隐藏空白更改
内联并排

Showing with 173 addition and 181 deletion

MyDelphi.dproj MyDelphi.dproj +22 -22

Unit1.LgXhdpiPh.fmx Unit1.LgXhdpiPh.fmx +49 -51

Unit1.fmx Unit1.fmx +97 -102

Unit1.pas Unit1.pas +5 -6

未找到文件。
--- a/MyDelphi.dproj
+++ b/MyDelphi.dproj
@@ -195,12 +195,12 @@
        <VerInfo_Build>1</VerInfo_Build>
        <VerInfo_AutoIncVersion>true</VerInfo_AutoIncVersion>
        <Android_NotificationAccentColor>#000000</Android_NotificationAccentColor>
-        <Android_LauncherIcon36>Icon\Authenticator(1).png</Android_LauncherIcon36>
-        <Android_LauncherIcon48>Icon\Authenticator(2).png</Android_LauncherIcon48>
-        <Android_LauncherIcon72>Icon\Authenticator(3).png</Android_LauncherIcon72>
-        <Android_LauncherIcon96>Icon\Authenticator(4).png</Android_LauncherIcon96>
-        <Android_LauncherIcon144>Icon\Authenticator(5).png</Android_LauncherIcon144>
-        <Android_LauncherIcon192>Icon\Authenticator(6).png</Android_LauncherIcon192>
+        <Android_LauncherIcon36>Icon\Authenticator_1_.png</Android_LauncherIcon36>
+        <Android_LauncherIcon48>Icon\Authenticator_2_.png</Android_LauncherIcon48>
+        <Android_LauncherIcon72>Icon\Authenticator_3_.png</Android_LauncherIcon72>
+        <Android_LauncherIcon96>Icon\Authenticator_4_.png</Android_LauncherIcon96>
+        <Android_LauncherIcon144>Icon\Authenticator_5_.png</Android_LauncherIcon144>
+        <Android_LauncherIcon192>Icon\Authenticator_6_.png</Android_LauncherIcon192>
    </PropertyGroup>
    <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
        <BT_BuildType>Debug</BT_BuildType>
@@ -294,21 +294,21 @@
                        <Overwrite>true</Overwrite>
                    </Platform>
                </DeployFile>
-                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_SplashImage_640x480.png" Configuration="Debug" Class="Android_SplashImage640">
+                <DeployFile LocalName="Icon\Authenticator_2_.png" Configuration="Debug" Class="Android_LauncherIcon48">
                    <Platform Name="Android64">
-                        <RemoteName>splash_image.png</RemoteName>
+                        <RemoteName>ic_launcher.png</RemoteName>
                        <Overwrite>true</Overwrite>
                    </Platform>
                </DeployFile>
-                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_NotificationIcon_72x72.png" Configuration="Debug" Class="Android_NotificationIcon72">
+                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_SplashImage_640x480.png" Configuration="Debug" Class="Android_SplashImage640">
                    <Platform Name="Android64">
-                        <RemoteName>ic_notification.png</RemoteName>
+                        <RemoteName>splash_image.png</RemoteName>
                        <Overwrite>true</Overwrite>
                    </Platform>
                </DeployFile>
-                <DeployFile LocalName="Icon\Authenticator(2).png" Configuration="Debug" Class="Android_LauncherIcon48">
+                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_NotificationIcon_72x72.png" Configuration="Debug" Class="Android_NotificationIcon72">
                    <Platform Name="Android64">
-                        <RemoteName>ic_launcher.png</RemoteName>
+                        <RemoteName>ic_notification.png</RemoteName>
                        <Overwrite>true</Overwrite>
                    </Platform>
                </DeployFile>
@@ -330,13 +330,13 @@
                        <Overwrite>true</Overwrite>
                    </Platform>
                </DeployFile>
-                <DeployFile LocalName="Icon\Authenticator(3).png" Configuration="Debug" Class="Android_LauncherIcon72">
+                <DeployFile LocalName="Icon\Authenticator_3_.png" Configuration="Debug" Class="Android_LauncherIcon72">
                    <Platform Name="Android64">
                        <RemoteName>ic_launcher.png</RemoteName>
                        <Overwrite>true</Overwrite>
                    </Platform>
                </DeployFile>
-                <DeployFile LocalName="Icon\Authenticator(6).png" Configuration="Debug" Class="Android_LauncherIcon192">
+                <DeployFile LocalName="Icon\Authenticator_6_.png" Configuration="Debug" Class="Android_LauncherIcon192">
                    <Platform Name="Android64">
                        <RemoteName>ic_launcher.png</RemoteName>
                        <Overwrite>true</Overwrite>
@@ -348,23 +348,23 @@
                        <Overwrite>true</Overwrite>
                    </Platform>
                </DeployFile>
-                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_NotificationIcon_24x24.png" Configuration="Debug" Class="Android_NotificationIcon24">
+                <DeployFile LocalName="Android64\Debug\colors.xml" Configuration="Debug" Class="Android_Colors">
                    <Platform Name="Android64">
-                        <RemoteName>ic_notification.png</RemoteName>
                        <Overwrite>true</Overwrite>
                    </Platform>
                </DeployFile>
-                <DeployFile LocalName="Android64\Debug\AndroidManifest.xml" Configuration="Debug" Class="ProjectAndroidManifest">
+                <DeployFile LocalName="Android64\Debug\styles.xml" Configuration="Debug" Class="AndroidSplashStyles">
                    <Platform Name="Android64">
                        <Overwrite>true</Overwrite>
                    </Platform>
                </DeployFile>
-                <DeployFile LocalName="Android64\Debug\colors.xml" Configuration="Debug" Class="Android_Colors">
+                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_NotificationIcon_24x24.png" Configuration="Debug" Class="Android_NotificationIcon24">
                    <Platform Name="Android64">
+                        <RemoteName>ic_notification.png</RemoteName>
                        <Overwrite>true</Overwrite>
                    </Platform>
                </DeployFile>
-                <DeployFile LocalName="Android64\Debug\styles.xml" Configuration="Debug" Class="AndroidSplashStyles">
+                <DeployFile LocalName="Android64\Debug\AndroidManifest.xml" Configuration="Debug" Class="ProjectAndroidManifest">
                    <Platform Name="Android64">
                        <Overwrite>true</Overwrite>
                    </Platform>
@@ -402,7 +402,7 @@
                        <Overwrite>true</Overwrite>
                    </Platform>
                </DeployFile>
-                <DeployFile LocalName="Icon\Authenticator(4).png" Configuration="Debug" Class="Android_LauncherIcon96">
+                <DeployFile LocalName="Icon\Authenticator_4_.png" Configuration="Debug" Class="Android_LauncherIcon96">
                    <Platform Name="Android64">
                        <RemoteName>ic_launcher.png</RemoteName>
                        <Overwrite>true</Overwrite>
@@ -419,7 +419,7 @@
                        <Overwrite>true</Overwrite>
                    </Platform>
                </DeployFile>
-                <DeployFile LocalName="Icon\Authenticator(1).png" Configuration="Debug" Class="Android_LauncherIcon36">
+                <DeployFile LocalName="Icon\Authenticator_1_.png" Configuration="Debug" Class="Android_LauncherIcon36">
                    <Platform Name="Android64">
                        <RemoteName>ic_launcher.png</RemoteName>
                        <Overwrite>true</Overwrite>
@@ -431,7 +431,7 @@
                        <Overwrite>true</Overwrite>
                    </Platform>
                </DeployFile>
-                <DeployFile LocalName="Icon\Authenticator(5).png" Configuration="Debug" Class="Android_LauncherIcon144">
+                <DeployFile LocalName="Icon\Authenticator_5_.png" Configuration="Debug" Class="Android_LauncherIcon144">
                    <Platform Name="Android64">
                        <RemoteName>ic_launcher.png</RemoteName>
                        <Overwrite>true</Overwrite>

--- a/Unit1.LgXhdpiPh.fmx
+++ b/Unit1.LgXhdpiPh.fmx
@@ -13,57 +13,55 @@ inherited Form1_LgXhdpiPh: TForm1_LgXhdpiPh
    end>
  OnShow = Formshow
  DesignerMasterStyle = 3
-  inherited ScaledLayout1: TScaledLayout
-    OriginalWidth = 450.000000000000000000
-    OriginalHeight = 695.000000000000000000
+  inherited Memo1: TMemo
+    Size.Width = 433.000000000000000000
+    Size.Height = 473.000000000000000000
+    Viewport.Width = 433.000000000000000000
+    Viewport.Height = 473.000000000000000000
+  end
+  inherited Button1: TButton
+    Anchors = [akTop, akRight]
+    Position.X = 370.000000000000000000
+    Size.Width = 80.000000000000000000
+  end
+  inherited Filedelete: TButton
+    Anchors = [akBottom]
+    Position.X = 38.000000000000000000
+    Position.Y = 640.000000000000000000
+    Size.Width = 165.000000000000000000
+  end
+  inherited FileExit: TButton
+    Anchors = [akBottom]
+    Position.X = 246.000000000000000000
+    Position.Y = 640.000000000000000000
+    Size.Width = 165.000000000000000000
+  end
+  inherited FileNew: TButton
+    Anchors = [akBottom]
+    Position.X = 38.000000000000000000
+    Position.Y = 512.000000000000000000
+    Size.Width = 165.000000000000000000
+    OnClick = FileNewClick
+  end
+  inherited FileOpen: TButton
+    Anchors = [akBottom]
+    Position.X = 246.000000000000000000
+    Position.Y = 512.000000000000000000
+    Size.Width = 165.000000000000000000
+  end
+  inherited FileSave: TButton
+    Anchors = [akBottom]
+    Position.X = 38.000000000000000000
+    Position.Y = 576.000000000000000000
+    Size.Width = 165.000000000000000000
+  end
+  inherited FileSaveAs: TButton
+    Anchors = [akBottom]
+    Position.X = 246.000000000000000000
+    Position.Y = 576.000000000000000000
+    Size.Width = 165.000000000000000000
+  end
+  inherited Label1: TLabel
    Size.Width = 450.000000000000000000
-    Size.Height = 695.000000000000000000
-    inherited Memo1: TMemo
-      Size.Width = 433.000000000000000000
-      Viewport.Width = 433.000000000000000000
-      Viewport.Height = 473.000000000000000000
-    end
-    inherited FileNew: TButton
-      Position.X = 32.000000000000000000
-      Position.Y = 512.000000000000000000
-      Text = #26032'    '#24314
-      OnClick = FileNewClick
-    end
-    inherited FileOpen: TButton
-      Position.X = 242.000000000000000000
-      Position.Y = 512.000000000000000000
-      Text = #25171'    '#24320
-      OnClick = FileOpenClick
-    end
-    inherited FileSave: TButton
-      Position.X = 32.000000000000000000
-      Position.Y = 576.000000000000000000
-      OnClick = FileSaveClick
-    end
-    inherited FileSaveAs: TButton
-      Position.X = 242.000000000000000000
-      Position.Y = 576.000000000000000000
-      OnClick = FileSaveAsClick
-    end
-    inherited FileExit: TButton
-      Position.X = 242.000000000000000000
-      Position.Y = 640.000000000000000000
-      OnClick = FileExitClick
-    end
-    inherited Label1: TLabel
-      Size.Width = 450.000000000000000000
-      TextSettings.VertAlign = Leading
-      Text = ''
-    end
-    inherited Button1: TButton
-      Position.X = 344.000000000000000000
-      Text = #36873#25321#24403#21069#34892
-    end
-    inherited Filedelete: TButton
-      Position.X = 32.000000000000000000
-      Position.Y = 640.000000000000000000
-      OnMouseDown = FiledeleteMouseDown
-      OnMouseUp = FiledeleteMouseUp
-    end
  end
 end
--- a/Unit1.fmx
+++ b/Unit1.fmx
@@ -9,109 +9,104 @@ object Form1: TForm1
  FormFactor.Devices = [Desktop]
  OnClose = FormClose
  DesignerMasterStyle = 3
-  object ScaledLayout1: TScaledLayout
-    Align = Client
-    OriginalWidth = 418.000000000000000000
-    OriginalHeight = 707.000000000000000000
+  object Memo1: TMemo
+    Touch.InteractiveGestures = [Pan, LongTap, DoubleTap]
+    DataDetectorTypes = []
+    TextSettings.WordWrap = True
+    Anchors = [akLeft, akTop, akRight]
+    Position.X = 8.000000000000000000
+    Position.Y = 24.000000000000000000
+    Size.Width = 401.000000000000000000
+    Size.Height = 481.000000000000000000
+    Size.PlatformDefault = False
+    TabOrder = 0
+    OnMouseLeave = Memo1MouseLeave
+    Viewport.Width = 393.000000000000000000
+    Viewport.Height = 473.000000000000000000
+  end
+  object Button1: TButton
+    Position.X = 312.000000000000000000
+    Size.Width = 105.000000000000000000
+    Size.Height = 25.000000000000000000
+    Size.PlatformDefault = False
+    TabOrder = 13
+    Text = #36873#24403#21069#34892
+    OnClick = Button1Click
+  end
+  object Filedelete: TButton
+    StyledSettings = [Family, Style, FontColor]
+    Position.X = 16.000000000000000000
+    Position.Y = 648.000000000000000000
+    Size.Width = 177.000000000000000000
+    Size.Height = 44.000000000000000000
+    Size.PlatformDefault = False
+    TabOrder = 6
+    Text = #21024'     '#38500
+    TextSettings.Font.Size = 22.000000000000000000
+  end
+  object FileExit: TButton
+    StyledSettings = [Family, Style, FontColor]
+    Position.X = 224.000000000000000000
+    Position.Y = 648.000000000000000000
+    Size.Width = 177.000000000000000000
+    Size.Height = 44.000000000000000000
+    Size.PlatformDefault = False
+    TabOrder = 7
+    Text = #36864'     '#20986
+    TextSettings.Font.Size = 22.000000000000000000
+    OnClick = FileExitClick
+  end
+  object FileNew: TButton
+    StyledSettings = [Family, Style, FontColor]
+    Position.X = 16.000000000000000000
+    Position.Y = 520.000000000000000000
+    Size.Width = 177.000000000000000000
+    Size.Height = 44.000000000000000000
+    Size.PlatformDefault = False
+    TabOrder = 11
+    Text = #26032'     '#24314
+    TextSettings.Font.Size = 22.000000000000000000
+  end
+  object FileOpen: TButton
+    StyledSettings = [Family, Style, FontColor]
+    Position.X = 224.000000000000000000
+    Position.Y = 520.000000000000000000
+    Size.Width = 177.000000000000000000
+    Size.Height = 44.000000000000000000
+    Size.PlatformDefault = False
+    TabOrder = 10
+    Text = #25171'     '#24320
+    TextSettings.Font.Size = 22.000000000000000000
+    OnClick = FileOpenClick
+  end
+  object FileSave: TButton
+    StyledSettings = [Family, Style, FontColor]
+    Position.X = 16.000000000000000000
+    Position.Y = 584.000000000000000000
+    Size.Width = 177.000000000000000000
+    Size.Height = 44.000000000000000000
+    Size.PlatformDefault = False
+    TabOrder = 9
+    Text = #20445'     '#23384
+    TextSettings.Font.Size = 22.000000000000000000
+  end
+  object FileSaveAs: TButton
+    StyledSettings = [Family, Style, FontColor]
+    Position.X = 224.000000000000000000
+    Position.Y = 584.000000000000000000
+    Size.Width = 177.000000000000000000
+    Size.Height = 44.000000000000000000
+    Size.PlatformDefault = False
+    TabOrder = 8
+    Text = #21478'     '#23384
+    TextSettings.Font.Size = 22.000000000000000000
+  end
+  object Label1: TLabel
+    Align = Top
    Size.Width = 418.000000000000000000
-    Size.Height = 707.000000000000000000
+    Size.Height = 25.000000000000000000
    Size.PlatformDefault = False
-    object Memo1: TMemo
-      Touch.InteractiveGestures = [Pan, LongTap, DoubleTap]
-      DataDetectorTypes = []
-      TextSettings.WordWrap = True
-      Position.X = 8.000000000000000000
-      Position.Y = 24.000000000000000000
-      Size.Width = 401.000000000000000000
-      Size.Height = 473.000000000000000000
-      Size.PlatformDefault = False
-      TabOrder = 0
-      OnMouseLeave = Memo1MouseLeave
-      Viewport.Width = 393.000000000000000000
-      Viewport.Height = 465.000000000000000000
-    end
-    object FileNew: TButton
-      StyledSettings = [Family, Style, FontColor]
-      Position.X = 16.000000000000000000
-      Position.Y = 520.000000000000000000
-      Size.Width = 177.000000000000000000
-      Size.Height = 44.000000000000000000
-      Size.PlatformDefault = False
-      TabOrder = 13
-      Text = #26032'     '#24314
-      TextSettings.Font.Size = 22.000000000000000000
-    end
-    object FileOpen: TButton
-      StyledSettings = [Family, Style, FontColor]
-      Position.X = 224.000000000000000000
-      Position.Y = 520.000000000000000000
-      Size.Width = 177.000000000000000000
-      Size.Height = 44.000000000000000000
-      Size.PlatformDefault = False
-      TabOrder = 12
-      Text = #25171'     '#24320
-      TextSettings.Font.Size = 22.000000000000000000
-    end
-    object FileSave: TButton
-      StyledSettings = [Family, Style, FontColor]
-      Position.X = 16.000000000000000000
-      Position.Y = 584.000000000000000000
-      Size.Width = 177.000000000000000000
-      Size.Height = 44.000000000000000000
-      Size.PlatformDefault = False
-      TabOrder = 11
-      Text = #20445'     '#23384
-      TextSettings.Font.Size = 22.000000000000000000
-    end
-    object FileSaveAs: TButton
-      StyledSettings = [Family, Style, FontColor]
-      Position.X = 224.000000000000000000
-      Position.Y = 584.000000000000000000
-      Size.Width = 177.000000000000000000
-      Size.Height = 44.000000000000000000
-      Size.PlatformDefault = False
-      TabOrder = 10
-      Text = #21478'     '#23384
-      TextSettings.Font.Size = 22.000000000000000000
-    end
-    object FileExit: TButton
-      StyledSettings = [Family, Style, FontColor]
-      Position.X = 224.000000000000000000
-      Position.Y = 648.000000000000000000
-      Size.Width = 177.000000000000000000
-      Size.Height = 44.000000000000000000
-      Size.PlatformDefault = False
-      TabOrder = 9
-      Text = #36864'     '#20986
-      TextSettings.Font.Size = 22.000000000000000000
-    end
-    object Label1: TLabel
-      Align = Top
-      Size.Width = 418.000000000000000000
-      Size.Height = 25.000000000000000000
-      Size.PlatformDefault = False
-      Text = 'Label1'
-      TabOrder = 14
-    end
-    object Button1: TButton
-      Position.X = 312.000000000000000000
-      Size.Width = 105.000000000000000000
-      Size.Height = 25.000000000000000000
-      Size.PlatformDefault = False
-      TabOrder = 15
-      Text = 'Button1'
-      OnClick = Button1Click
-    end
-    object Filedelete: TButton
-      StyledSettings = [Family, Style, FontColor]
-      Position.X = 16.000000000000000000
-      Position.Y = 648.000000000000000000
-      Size.Width = 177.000000000000000000
-      Size.Height = 44.000000000000000000
-      Size.PlatformDefault = False
-      TabOrder = 8
-      Text = #21024'     '#38500
-      TextSettings.Font.Size = 22.000000000000000000
-    end
+    Text = 'Label1'
+    TabOrder = 12
  end
 end
--- a/Unit1.pas
+++ b/Unit1.pas
@@ -10,16 +10,15 @@ uses

 type
  TForm1 = class(TForm)
-    ScaledLayout1: TScaledLayout;
    Memo1: TMemo;
+    Button1: TButton;
+    Filedelete: TButton;
+    FileExit: TButton;
    FileNew: TButton;
    FileOpen: TButton;
    FileSave: TButton;
    FileSaveAs: TButton;
-    FileExit: TButton;
    Label1: TLabel;
-    Button1: TButton;
-    Filedelete: TButton;

    procedure FileNewClick(Sender: TObject);
    procedure FileOpenClick(Sender: TObject);
@@ -262,7 +261,7 @@ begin

  SetFileName(sUntitled);
  label1.text:='当前文件：'+sUntitled+'.txt';
-  memo1.height:= 473;  //将meno控件恢复到默认高度
+  memo1.height:= 475;  //将meno控件恢复到默认高度

 end;

@@ -278,7 +277,7 @@ begin

  if (i>0)and(memo1.height>470) then
  begin
-     memo1.height:=370;
+     memo1.height:=383;
     memo1.selstart:=i;
  end;