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.

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

Fixes #2624. Fixes #2623 #2637

Merged
Merged
Changes from all commits
Commits
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
16 changes: 12 additions & 4 deletions src/PKSim.UI/Views/DiseaseStates/DiseaseStateSelectionView.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using DevExpress.XtraLayout.Utils;
using DevExpress.LookAndFeel;
using DevExpress.XtraLayout.Utils;
using OSPSuite.DataBinding;
using OSPSuite.DataBinding.DevExpress;
using OSPSuite.Presentation.Extensions;
Expand All @@ -18,9 +19,11 @@ public partial class DiseaseStateSelectionView : BaseUserControl, IDiseaseStateS
{
private readonly ScreenBinder<DiseaseStateDTO> _screenBinder = new ScreenBinder<DiseaseStateDTO>();
private IDiseaseStateSelectionPresenter _presenter;
private readonly UserLookAndFeel _lookAndFeel;

public DiseaseStateSelectionView()
public DiseaseStateSelectionView(UserLookAndFeel lookAndFeel)
{
_lookAndFeel = lookAndFeel;
InitializeComponent();
}

Expand All @@ -44,7 +47,11 @@ public void BindTo(DiseaseStateDTO diseaseStateDTO)

public string SelectionLabel
{
set => layoutItemDiseaseState.Text = value.FormatForLabel();
set
{
layoutItemDiseaseState.TextVisible = true;
layoutItemDiseaseState.Text = value.FormatForLabel();
}
}

public bool ShowDescription
Expand Down Expand Up @@ -80,9 +87,10 @@ public override void InitializeResources()
base.InitializeResources();
layoutControl.Margin = new Padding(0);
layoutControl.Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0);
layoutItemDiseaseState.Text = PKSimConstants.UI.Select.FormatForLabel();
layoutItemDiseaseState.TextVisible = false;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Yuri05 Hiding select for now. It's clear that you have to choose

layoutItemDiseaseParameter.TextVisible = false;
lblDescription.AsDescription();
layoutControl.InitializeDisabledColors(_lookAndFeel);
}
}
}