Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modus control (TMInput) is not working in .Net 9 #409 #410

Merged
merged 1 commit into from
Nov 27, 2024
Merged

Modus control (TMInput) is not working in .Net 9 #409 #410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 43 additions & 2 deletions Trimble.Modus.Components/Controls/TMInput/BaseInput.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,55 @@
<ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:local="clr-namespace:Trimble.Modus.Components"
x:Class="Trimble.Modus.Components.Controls.BaseInput.BaseInput">
x:Class="Trimble.Modus.Components.Controls.BaseInput.BaseInput"
xmlns:Modus="clr-namespace:Trimble.Modus.Components">

<ContentView.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<local:TMInputStyles></local:TMInputStyles>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</ResourceDictionary>
<ControlTemplate x:Key="InputTemplate">
<Grid x:Name="tmInputContainer"
RowDefinitions="auto,auto,auto"
RowSpacing="0"
Padding="0"
BindingContext="{Binding Source={RelativeSource TemplatedParent}}">
<Modus:ControlLabel x:Name="controlLabel"
IsEnabled="{Binding IsEnabled}"
IsReadOnly="{Binding IsReadOnly}"
TitleText="{Binding TitleText}"
IsRequired="{Binding IsRequired}" />
<Border x:Name="inputBorder"
MinimumHeightRequest="48"
VerticalOptions="FillAndExpand"
Grid.Row="1"
Padding="0">
<Border.StrokeShape>
<RoundRectangle CornerRadius="4" />
</Border.StrokeShape>
<ContentPresenter VerticalOptions="FillAndExpand" />
</Border>
<Grid x:Name="inputHelperLayout"
Grid.Row="2"
HorizontalOptions="Start"
ColumnSpacing="5"
ColumnDefinitions="auto,*"
Margin="2"
IsVisible="false"
Padding="0,5,0,0">
<Image x:Name="inputHelperIcon"
Grid.Column="0"
WidthRequest="20"
HeightRequest="20" />
<Label x:Name="inputHelperLabel"
Grid.Column="1"
FontFamily="OpenSansRegular"
LineBreakMode="WordWrap" />
</Grid>
</Grid>
</ControlTemplate>
</ContentView.Resources>

</ContentView>
Expand Down
52 changes: 0 additions & 52 deletions Trimble.Modus.Components/Controls/TMInput/InputTemplateResourceDictionary.xaml
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions Trimble.Modus.Components/Controls/TMInput/InputTemplateResourceDictionary.xaml.cs
View file
Open in desktop

This file was deleted.

8 changes: 1 addition & 7 deletions Trimble.Modus.Components/Controls/TMInput/MultiLineInput.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,11 @@
xmlns:controls="clr-namespace:Trimble.Modus.Components"
x:Name="multiLineInput">

<base:BaseInput.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="InputTemplateResourceDictionary.xaml" />
<local:TMInputStyles></local:TMInputStyles>
</ResourceDictionary.MergedDictionaries>
<base:BaseInput.Resources>
<converters:ImageNullOrEmptyBoolConverter x:Key="ImageNullOrEmptyBoolConverter" />
<converters:StringNotNullOrEmptyBoolConverter x:Key="StringNotNullOrEmptyBoolConverter" />
<converters:InverseBoolConverter x:Key="InverseBoolConverter" />
<converters:AllTrueConverter x:Key="AllTrueConverter" />
</ResourceDictionary>
</base:BaseInput.Resources>
<StackLayout x:Name="editorStackLayout"
Padding="10"
Expand Down
10 changes: 2 additions & 8 deletions Trimble.Modus.Components/Controls/TMInput/TMInput.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,11 @@
xmlns:controls="clr-namespace:Trimble.Modus.Components"
x:Name="singleInput">

<base:BaseInput.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="InputTemplateResourceDictionary.xaml" />
<local:TMInputStyles></local:TMInputStyles>
</ResourceDictionary.MergedDictionaries>
<base:BaseInput.Resources>
<converters:ImageNullOrEmptyBoolConverter x:Key="ImageNullOrEmptyBoolConverter" />
<converters:StringNotNullOrEmptyBoolConverter x:Key="StringNotNullOrEmptyBoolConverter" />
<converters:InverseBoolConverter x:Key="InverseBoolConverter" />
<converters:AllTrueConverter x:Key="AllTrueConverter" />
</ResourceDictionary>
<converters:AllTrueConverter x:Key="AllTrueConverter" />
</base:BaseInput.Resources>

<Grid ColumnDefinitions="auto,*,auto"
Expand Down
Loading