Spring/spring-shell
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix fg and bg styling

Browse Source 
- In ListView and MenuView fix how styling for
  background and foreground are used.
- In Catalog app fix same issue in ScenarioListCell
- Fixes #1063
This commit is contained in:
Janne Valkealahti
2024-05-07 08:05:45 +01:00
parent 419f6a8aa4
commit 2b18de0ffb
5 changed files with 155 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-shell-core/src/main/java/org/springframework/shell/component/view/control/ListView.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2023 the original author or authors.
* Copyright 2023-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -169,6 +169,8 @@ public class ListView<T> extends BoxView {
Rectangle rect = getInnerRect();
int y = rect.y();
int selectedStyle = resolveThemeStyle(StyleSettings.TAG_HIGHLIGHT, ScreenItem.STYLE_BOLD);
int selectedForegroundColor = resolveThemeForeground(StyleSettings.TAG_HIGHLIGHT, -1, -1);
int selectedBackgroundColor = resolveThemeBackground(StyleSettings.TAG_HIGHLIGHT, -1, -1);
int i = 0;
for (ListCell<T> c : cells) {
@@ -178,10 +180,13 @@ public class ListView<T> extends BoxView {
}
c.setRect(rect.x(), y++, rect.width(), 1);
if (i == start + pos) {
c.setForegroundColor(selectedForegroundColor);
c.setBackgroundColor(selectedBackgroundColor);
c.setStyle(selectedStyle);
}
else {
c.setBackgroundColor(-1);
c.setForegroundColor(-1);
c.setStyle(-1);
}
c.draw(screen);

20
spring-shell-core/src/main/java/org/springframework/shell/component/view/control/MenuView.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2023 the original author or authors.
* Copyright 2023-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -143,9 +143,15 @@ public class MenuView extends BoxView {
protected void drawInternal(Screen screen) {
Rectangle rect = getInnerRect();
int y = rect.y();
Writer writer = screen.writerBuilder().layer(getLayer()).build();
int themeStyle = resolveThemeStyle(StyleSettings.TAG_HIGHLIGHT, ScreenItem.STYLE_BOLD);
Writer writer2 = screen.writerBuilder().layer(getLayer()).style(themeStyle).build();
int selectedStyle = resolveThemeStyle(StyleSettings.TAG_HIGHLIGHT, ScreenItem.STYLE_BOLD);
int selectedForegroundColor = resolveThemeForeground(StyleSettings.TAG_HIGHLIGHT, -1, -1);
int selectedBackgroundColor = resolveThemeBackground(StyleSettings.TAG_HIGHLIGHT, -1, -1);
Writer writer = screen.writerBuilder()
.layer(getLayer()).build();
Writer selectedWriter = screen.writerBuilder()
.layer(getLayer())
.color(selectedForegroundColor)
.style(selectedStyle).build();
int i = 0;
boolean hasCheck = false;
for (MenuItem item : items) {
@@ -174,7 +180,11 @@ public class MenuView extends BoxView {
}
String text = prefix + item.getTitle();
if (activeItemIndex == i) {
writer2.text(text, rect.x(), y);
selectedWriter.text(text, rect.x(), y);
if (selectedBackgroundColor > -1) {
Rectangle itemRect = new Rectangle(rect.x(), y, rect.width(), 1);
selectedWriter.background(itemRect, selectedBackgroundColor);
}
}
else {
writer.text(text, rect.x(), y);