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

Fixed vertical scroll bar drawing on 4K monitors

This commit is contained in:
Kai S. K. Engelbart 2019-12-17 08:17:22 +01:00
parent 396686bfdc
commit 69153005cd
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -195,7 +195,6 @@ public class ChatWindow extends JFrame {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
final JList<User> selectedUserList = (JList<User>) listSelectionEvent.getSource(); final JList<User> selectedUserList = (JList<User>) listSelectionEvent.getSource();
final User user = selectedUserList.getSelectedValue(); final User user = selectedUserList.getSelectedValue();
client.setRecipient(user);
currentChat = localDB.getChats().stream().filter(chat -> chat.getRecipient().getID() == user.getID()).findFirst().get(); currentChat = localDB.getChats().stream().filter(chat -> chat.getRecipient().getID() == user.getID()).findFirst().get();

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

@ -68,7 +68,7 @@ public class PrimaryScrollBar extends BasicScrollBarUI {
Color color; Color color;
JScrollBar sb = (JScrollBar) c; JScrollBar sb = (JScrollBar) c;
if (!sb.isEnabled() || (isVertical && r.width > r.height) || (!isVertical && r.width < r.height)) return; if (!sb.isEnabled()) return;
if (isDragging) color = draggingColor; if (isDragging) color = draggingColor;
else if (isThumbRollover()) color = hoverColor; else if (isThumbRollover()) color = hoverColor;
@ -76,9 +76,9 @@ public class PrimaryScrollBar extends BasicScrollBarUI {
g2.setPaint(color); g2.setPaint(color);
if (isVertical) { if (isVertical) {
g2.fillRoundRect(r.x + 9, r.y, r.width - 10, r.height, arcSize, arcSize); g2.fillRoundRect(r.x - 9, r.y, r.width, r.height, arcSize, arcSize);
g2.setPaint(Settings.getInstance().getThemes().get(Settings.getInstance().getCurrentTheme()).getCellColor()); 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.drawRoundRect(r.x - 9, r.y, r.width, r.height, arcSize, arcSize);
} else { } else {
g2.fillRoundRect(r.x, r.y + 9, r.width, r.height - 10, arcSize, arcSize); 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.setPaint(Settings.getInstance().getThemes().get(Settings.getInstance().getCurrentTheme()).getCellColor());

5
src/main/java/envoy/client/ui/PrimaryScrollPane.java
View File

@ -21,7 +21,7 @@ public class PrimaryScrollPane extends JScrollPane {
/** /**
* Styles the vertical and horizontal scroll bars. * Styles the vertical and horizontal scroll bars.
* *
* @param theme * @param theme
* @since Envoy v0.2-alpha * @since Envoy v0.2-alpha
*/ */
@ -31,6 +31,7 @@ public class PrimaryScrollPane extends JScrollPane {
getVerticalScrollBar().setBackground(theme.getCellColor()); getVerticalScrollBar().setBackground(theme.getCellColor());
getVerticalScrollBar().setUI(new PrimaryScrollBar(theme, true)); getVerticalScrollBar().setUI(new PrimaryScrollBar(theme, true));
getHorizontalScrollBar().setBackground(theme.getCellColor()); getHorizontalScrollBar().setBackground(theme.getCellColor());
getHorizontalScrollBar().setUI(new PrimaryScrollBar(theme, false)); getHorizontalScrollBar().setUI(new PrimaryScrollBar(theme, false));
} }
@ -45,7 +46,7 @@ public class PrimaryScrollPane extends JScrollPane {
* </br> * </br>
* When rereading messages, the chat doesn't scroll down if new messages </br> * When rereading messages, the chat doesn't scroll down if new messages </br>
* are added. (Besides see first point) * are added. (Besides see first point)
* *
* @since Envoy v0.2-alpha * @since Envoy v0.2-alpha
*/ */
public void autoscroll() { public void autoscroll() {