プロパティの表示を修正 (MediaSource, TimeSpanEditor)

b-editor · Aug 31, 2023 · 6d92360 · 6d92360
1 parent 5b479d2
commit 6d92360
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 20 deletions.
diff --git a/src/Beutl/Views/Editors/ImageSourceEditor.axaml b/src/Beutl/Views/Editors/ImageSourceEditor.axaml
@@ -7,18 +7,28 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:ui="using:FluentAvalonia.UI.Controls"
              xmlns:vm="using:Beutl.ViewModels.Editors"
+             Margin="4,0"
              d:DesignWidth="300"
              x:CompileBindings="True"
              x:DataType="vm:ImageSourceEditorViewModel"
              mc:Ignorable="d">
-    <Grid ColumnDefinitions="2*,3*,Auto">
-        <TextBlock Margin="8,0,0,0"
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="2*" />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="150" SharedSizeGroup="TextBox_SizeGroup" />
+            <ColumnDefinition Width="Auto" />
+        </Grid.ColumnDefinitions>
+        <TextBlock Margin="4,0,0,0"
                    HorizontalAlignment="Left"
                    VerticalAlignment="Center"
                    Text="{Binding Header}" />
 
+        <GridSplitter Grid.Column="1" Background="Transparent" />
+
+
         <Button x:Name="button"
-                Grid.Column="1"
+                Grid.Column="2"
                 Margin="4"
                 HorizontalAlignment="Stretch"
                 HorizontalContentAlignment="Stretch"
@@ -34,7 +44,6 @@
             </Grid>
         </Button>
 
-
-        <local:PropertyEditorMenu Grid.Column="2" />
+        <local:PropertyEditorMenu Grid.Column="3" />
     </Grid>
 </UserControl>
diff --git a/src/Beutl/Views/Editors/SoundSourceEditor.axaml b/src/Beutl/Views/Editors/SoundSourceEditor.axaml
@@ -7,18 +7,28 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:ui="using:FluentAvalonia.UI.Controls"
              xmlns:vm="using:Beutl.ViewModels.Editors"
+             Margin="4,0"
              d:DesignWidth="300"
              x:CompileBindings="True"
              x:DataType="vm:SoundSourceEditorViewModel"
              mc:Ignorable="d">
-    <Grid ColumnDefinitions="2*,3*,Auto">
-        <TextBlock Margin="8,0,0,0"
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="2*" />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="150" SharedSizeGroup="TextBox_SizeGroup" />
+            <ColumnDefinition Width="Auto" />
+        </Grid.ColumnDefinitions>
+        <TextBlock Margin="4,0,0,0"
                    HorizontalAlignment="Left"
                    VerticalAlignment="Center"
                    Text="{Binding Header}" />
 
+        <GridSplitter Grid.Column="1" Background="Transparent" />
+
+
         <Button x:Name="button"
-                Grid.Column="1"
+                Grid.Column="2"
                 Margin="4"
                 HorizontalAlignment="Stretch"
                 HorizontalContentAlignment="Stretch"
@@ -34,7 +44,6 @@
             </Grid>
         </Button>
 
-
-        <local:PropertyEditorMenu Grid.Column="2" />
+        <local:PropertyEditorMenu Grid.Column="3" />
     </Grid>
 </UserControl>
diff --git a/src/Beutl/Views/Editors/TimeSpanEditor.axaml b/src/Beutl/Views/Editors/TimeSpanEditor.axaml
@@ -5,18 +5,32 @@
              xmlns:local="using:Beutl.Views.Editors"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:vm="using:Beutl.ViewModels.Editors"
+             Margin="4,0"
              d:DesignWidth="300"
              x:CompileBindings="True"
              x:DataType="vm:TimeSpanEditorViewModel"
              mc:Ignorable="d">
-    <Grid ColumnDefinitions="2*,3*,Auto">
-        <TextBlock Margin="8,0,0,0"
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="2*" />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="150" SharedSizeGroup="TextBox_SizeGroup" />
+            <ColumnDefinition Width="Auto" />
+        </Grid.ColumnDefinitions>
+
+        <TextBlock Margin="4,0,0,0"
                    HorizontalAlignment="Left"
                    VerticalAlignment="Center"
-                   Text="{Binding Header}" />
+                   ClipToBounds="False"
+                   Text="{Binding Header}"
+                   TextTrimming="CharacterEllipsis" />
+
+        <GridSplitter Grid.Column="1" Background="Transparent" />
 
         <TextBox x:Name="textBox"
-                 Grid.Column="1"
+                 Grid.Column="2"
+                 MinWidth="120"
+                 Margin="4"
                  IsEnabled="{Binding CanEdit.Value}"
                  Text="{Binding Text.Value, Mode=OneWay}">
             <TextBox.Styles>
@@ -29,6 +43,6 @@
             </TextBox.Styles>
         </TextBox>
 
-        <local:PropertyEditorMenu Grid.Column="2" />
+        <local:PropertyEditorMenu Grid.Column="3" />
     </Grid>
 </UserControl>
diff --git a/src/Beutl/Views/Editors/VideoSourceEditor.axaml b/src/Beutl/Views/Editors/VideoSourceEditor.axaml
@@ -7,18 +7,28 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:ui="using:FluentAvalonia.UI.Controls"
              xmlns:vm="using:Beutl.ViewModels.Editors"
+             Margin="4,0"
              d:DesignWidth="300"
              x:CompileBindings="True"
              x:DataType="vm:VideoSourceEditorViewModel"
              mc:Ignorable="d">
-    <Grid ColumnDefinitions="2*,3*,Auto">
-        <TextBlock Margin="8,0,0,0"
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="2*" />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="150" SharedSizeGroup="TextBox_SizeGroup" />
+            <ColumnDefinition Width="Auto" />
+        </Grid.ColumnDefinitions>
+        <TextBlock Margin="4,0,0,0"
                    HorizontalAlignment="Left"
                    VerticalAlignment="Center"
                    Text="{Binding Header}" />
 
+        <GridSplitter Grid.Column="1" Background="Transparent" />
+
+
         <Button x:Name="button"
-                Grid.Column="1"
+                Grid.Column="2"
                 Margin="4"
                 HorizontalAlignment="Stretch"
                 HorizontalContentAlignment="Stretch"
@@ -34,7 +44,6 @@
             </Grid>
         </Button>
 
-
-        <local:PropertyEditorMenu Grid.Column="2" />
+        <local:PropertyEditorMenu Grid.Column="3" />
     </Grid>
 </UserControl>