diff options
| author | Ruslan Zakharov <r.zakharov@samsung.com> | 2017-08-04 14:37:54 +0300 |
|---|---|---|
| committer | Ruslan Zakharov <r.zakharov@samsung.com> | 2017-08-14 15:05:21 +0300 |
| commit | 7242f7ce3998df901c488fe991f2f0601276fffe (patch) | |
| tree | 99ed1b1423dc1ac878862c031f970bcc89fa7da3 | |
| parent | 4aa8514d0d1ff5d34f12afd12f7b4bf4fb47f15b (diff) | |
| download | call-ui-7242f7ce3998df901c488fe991f2f0601276fffe.tar.gz call-ui-7242f7ce3998df901c488fe991f2f0601276fffe.tar.bz2 call-ui-7242f7ce3998df901c488fe991f2f0601276fffe.zip | |
TizenRefApp-8939 Add dim style for Flat Button
Added dim style for Flat Button
Change-Id: Iaf908a4381a53d5292aaf0aae1e53987804c7b6d
| -rw-r--r-- | CallApp.Tizen/Call/Controls/FlatButton.xaml | 16 | ||||
| -rw-r--r-- | CallApp.Tizen/Call/Controls/FlatCheckbox.xaml | 4 | ||||
| -rw-r--r-- | CallApp.Tizen/Call/Themes/FlatControlTheme.xaml | 1 |
3 files changed, 19 insertions, 2 deletions
diff --git a/CallApp.Tizen/Call/Controls/FlatButton.xaml b/CallApp.Tizen/Call/Controls/FlatButton.xaml index f31ebfc..e11eae2 100644 --- a/CallApp.Tizen/Call/Controls/FlatButton.xaml +++ b/CallApp.Tizen/Call/Controls/FlatButton.xaml @@ -31,10 +31,22 @@ </Grid.RowDefinitions> <commonControls:CustomImage Grid.Column="1" Grid.Row="1" HorizontalOptions="Center" VerticalOptions="Center" - Source="{TemplateBinding Image}" BlendingColor="{TemplateBinding ImageColor}" /> + Source="{TemplateBinding Image}" BlendingColor="{TemplateBinding ImageColor}"> + <commonControls:CustomImage.Triggers> + <DataTrigger TargetType="commonControls:CustomImage" Binding="{TemplateBinding IsEnabled}" Value="False"> + <Setter Property="BlendingColor" Value="{StaticResource FlatControlDimColor}" /> + </DataTrigger> + </commonControls:CustomImage.Triggers> + </commonControls:CustomImage> <Label Grid.Column="1" Grid.Row="3" HorizontalOptions="Center" VerticalOptions="Center" FontSize="19" - Text="{TemplateBinding Text}" TextColor="{TemplateBinding TextColor}" /> + Text="{TemplateBinding Text}" TextColor="{TemplateBinding TextColor}"> + <Label.Triggers> + <DataTrigger TargetType="Label" Binding="{TemplateBinding IsEnabled}" Value="False"> + <Setter Property="TextColor" Value="{StaticResource FlatControlDimColor}" /> + </DataTrigger> + </Label.Triggers> + </Label> <ContentPresenter Grid.Column="1" Grid.Row="4" /> </commonControls:CustomGrid> diff --git a/CallApp.Tizen/Call/Controls/FlatCheckbox.xaml b/CallApp.Tizen/Call/Controls/FlatCheckbox.xaml index 649a789..d248248 100644 --- a/CallApp.Tizen/Call/Controls/FlatCheckbox.xaml +++ b/CallApp.Tizen/Call/Controls/FlatCheckbox.xaml @@ -35,6 +35,10 @@ <DataTrigger TargetType="commonControls:CustomGrid" Binding="{Binding IsChecked, Source={x:Reference This}}" Value="True"> <Setter Property="BackgroundColor" Value="{StaticResource FlatControlCheckOnColor}" /> </DataTrigger> + + <DataTrigger TargetType="commonControls:CustomGrid" Binding="{Binding IsEnabled, Source={x:Reference This}}" Value="False"> + <Setter Property="BackgroundColor" Value="{StaticResource FlatControlDimColor}" /> + </DataTrigger> </commonControls:CustomGrid.Triggers> </commonControls:CustomGrid> </commonControls:CustomGrid> diff --git a/CallApp.Tizen/Call/Themes/FlatControlTheme.xaml b/CallApp.Tizen/Call/Themes/FlatControlTheme.xaml index 3854ff1..76d13df 100644 --- a/CallApp.Tizen/Call/Themes/FlatControlTheme.xaml +++ b/CallApp.Tizen/Call/Themes/FlatControlTheme.xaml @@ -8,6 +8,7 @@ <Color x:Key="FlatControlBorderColor">#FFD9D9D9</Color> <Color x:Key="FlatControlCheckOffColor">#4C666666</Color> <Color x:Key="FlatControlCheckOnColor">#FF2EB4C8</Color> + <Color x:Key="FlatControlDimColor">#4D4D4D4D</Color> <Color x:Key="FlatControlImageDimColor">#4C808080</Color> <Color x:Key="FlatControlImageNormalColor">#FF808080</Color> <Color x:Key="FlatControlImageOnColor">#FF2EB4C8</Color> |