zdm/envoy
zdm/envoy
Archived
3
Fork 0
Code Issues 22 Pull Requests Releases 1 Wiki Activity

Horizontal Scroll Bar

Browse Source 
Implemented primaryScrollBar support for horizontal scroll bar as well.
This commit is contained in:
DieGurke 2019-12-15 00:34:44 +01:00
parent c5956ef6f4
commit b1f9172b63
2 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/envoy/client/ui/ChatWindow.java
View File

@ -262,7 +262,15 @@ public class ChatWindow extends JFrame {
scrollPane.getVerticalScrollBar() scrollPane.getVerticalScrollBar()
.setUI(new PrimaryScrollBar(5, theme.getInteractableBackgroundColor(), .setUI(new PrimaryScrollBar(5, theme.getInteractableBackgroundColor(),
new Color(theme.getInteractableBackgroundColor().getRGB() - 50), new Color(theme.getInteractableBackgroundColor().getRGB() - 50),
new Color(theme.getInteractableBackgroundColor().getRGB() + 170))); new Color(theme.getInteractableBackgroundColor().getRGB() + 170), true));
scrollPane.getHorizontalScrollBar().setBackground(theme.getCellColor());
scrollPane.getHorizontalScrollBar()
.setUI(new PrimaryScrollBar(5, theme.getInteractableBackgroundColor(), new Color(theme.getInteractableBackgroundColor().getRGB() - 50),
new Color(theme.getInteractableBackgroundColor().getRGB() + 170), false));
// int currentVerticalScrollBarValue =
// scrollPane.getVerticalScrollBar().getValue() +
// scrollPane.getVerticalScrollBar().getVisibleAmount(); Work in Progress for
// autoscroll
// messageEnterTextArea // messageEnterTextArea
messageEnterTextArea.setCaretColor(theme.getTypingMessageColor()); messageEnterTextArea.setCaretColor(theme.getTypingMessageColor());
messageEnterTextArea.setForeground(theme.getTypingMessageColor()); messageEnterTextArea.setForeground(theme.getTypingMessageColor());

26
src/main/java/envoy/client/ui/PrimaryScrollBar.java
View File

@ -29,12 +29,14 @@ public class PrimaryScrollBar extends BasicScrollBarUI{
private Color scrollBarColor; private Color scrollBarColor;
private Color hoverColor; private Color hoverColor;
private Color draggingColor; private Color draggingColor;
private boolean isVertical;
public PrimaryScrollBar(int arcSize, Color scrollBarColor, Color hoverColor, Color draggingColor) { public PrimaryScrollBar(int arcSize, Color scrollBarColor, Color hoverColor, Color draggingColor, boolean isVertical) {
this.arcSize = arcSize; this.arcSize = arcSize;
this.scrollBarColor = scrollBarColor; this.scrollBarColor = scrollBarColor;
this.hoverColor = hoverColor; this.hoverColor = hoverColor;
this.draggingColor = draggingColor; this.draggingColor = draggingColor;
this.isVertical = isVertical;
} }
@Override @Override
@ -71,7 +73,7 @@ public class PrimaryScrollBar extends BasicScrollBarUI{
g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
Color color = null; Color color = null;
JScrollBar sb = (JScrollBar) c; JScrollBar sb = (JScrollBar) c;
if (!sb.isEnabled() || r.width > r.height) { if (!sb.isEnabled() || (isVertical == true && r.width > r.height) || (isVertical == false && r.width < r.height)) {
return; return;
} else if (isDragging) { } else if (isDragging) {
color = draggingColor; color = draggingColor;
@ -80,11 +82,21 @@ public class PrimaryScrollBar extends BasicScrollBarUI{
} else { } else {
color = scrollBarColor; color = scrollBarColor;
} }
g2.setPaint(color);
g2.fillRoundRect(r.x + 9, r.y, r.width - 10, r.height, arcSize, arcSize); if (isVertical == true) {
g2.setPaint(Settings.getInstance().getThemes().get(Settings.getInstance().getCurrentTheme()).getCellColor()); g2.setPaint(color);
g2.drawRoundRect(r.x + 9, r.y, r.width - 10, r.height, arcSize, arcSize); g2.fillRoundRect(r.x + 9, r.y, r.width - 10, r.height, arcSize, arcSize);
g2.dispose(); g2.setPaint(Settings.getInstance().getThemes().get(Settings.getInstance().getCurrentTheme()).getCellColor());
g2.drawRoundRect(r.x + 9, r.y, r.width - 10, r.height, arcSize, arcSize);
g2.dispose();
}
if (isVertical == false) {
g2.setPaint(color);
g2.fillRoundRect(r.x, r.y + 9, r.width, r.height - 10, arcSize, arcSize);
g2.setPaint(Settings.getInstance().getThemes().get(Settings.getInstance().getCurrentTheme()).getCellColor());
g2.drawRoundRect(r.x, r.y + 9, r.width, r.height - 10, arcSize, arcSize);
g2.dispose();
}
} }
@Override @Override