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

Jump to bottom

Fix legacy conversion Group Container #2772

Merged
merged 2 commits into from
Aug 18, 2023
Merged

Fix legacy conversion Group Container #2772

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e59f14b
Fix legacy conversion Group Container #2743
Mathis-Hu Aug 16, 2023
662ba8c
Merge branch 'main_fork' of https://github.com/Mathis-Hu/phoebus into…
Mathis-Hu Aug 16, 2023
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
10 changes: 7 additions & 3 deletions app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/GroupWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,13 +179,17 @@ public boolean configureFromXML(final ModelReader model_reader, final Widget wid
// -> Use as 'foreground_color'
final Element text = XMLUtil.getChildElement(xml, "border_color");
if (text != null)
group_widget.line.readFromXML(model_reader, text);
if (group_widget.style.getValue() != Style.TITLE)
group_widget.foreground.readFromXML(model_reader, text);
}

if (xml_version.getMajor() < 3) {
final Element text_foreground = XMLUtil.getChildElement(xml, "foreground_color");
if (text_foreground != null)
group_widget.line.readFromXML(model_reader, text_foreground);
if(xml_version.getMajor() > 1){
final Element text_foreground = XMLUtil.getChildElement(xml, "foreground_color");
if (text_foreground != null)
group_widget.line.readFromXML(model_reader, text_foreground);
}
final Element text_background = XMLUtil.getChildElement(xml, "background_color");
if (text_background != null && group_widget.style.getValue() == Style.TITLE)
group_widget.foreground.readFromXML(model_reader, text_background);
Expand Down
Loading