feat: replace the login screen's Exit button with an X in the corner
The full-width button under Connect took a row in a card that is close to filling an 800 px high screen. The X is a focus stop between the saved servers and the address field, so Up from the address field still reaches it from a controller. Bumps the version to 0.10.1.
This commit is contained in:
+26
-16
@@ -1101,21 +1101,6 @@ component LoginView inherits Rectangle {
|
||||
clicked => { root.submit(); }
|
||||
}
|
||||
}
|
||||
// Secondary to Connect: outlined, no fill, and only lit when focused.
|
||||
Rectangle {
|
||||
height: 46px * Theme.s;
|
||||
border-radius: 12px * Theme.s;
|
||||
border-width: 2px * Theme.s;
|
||||
border-color: root.focus-index == 4 ? Theme.focus : Theme.line;
|
||||
Text {
|
||||
text: root.can-cancel ? "Cancel" : "Exit";
|
||||
font-size: 17px * Theme.s;
|
||||
color: root.focus-index == 4 ? Theme.text : Theme.muted;
|
||||
}
|
||||
TouchArea {
|
||||
clicked => { root.exit(); }
|
||||
}
|
||||
}
|
||||
if root.error != "": Text {
|
||||
text: root.error;
|
||||
font-size: 15px * Theme.s;
|
||||
@@ -1129,6 +1114,31 @@ component LoginView inherits Rectangle {
|
||||
wrap: word-wrap;
|
||||
}
|
||||
}
|
||||
|
||||
// Exit, or Cancel when adding a server from inside the app. A
|
||||
// corner button rather than a row, to keep the card short.
|
||||
Rectangle {
|
||||
x: parent.width - self.width - 14px * Theme.s;
|
||||
y: 14px * Theme.s;
|
||||
width: 44px * Theme.s;
|
||||
height: 44px * Theme.s;
|
||||
border-radius: self.width / 2;
|
||||
background: root.focus-index == -1 || x-area.has-hover ? Theme.raised : transparent;
|
||||
border-width: 2px * Theme.s;
|
||||
border-color: root.focus-index == -1 ? Theme.focus : transparent;
|
||||
Path {
|
||||
width: 18px * Theme.s;
|
||||
height: 18px * Theme.s;
|
||||
viewbox-width: 24;
|
||||
viewbox-height: 24;
|
||||
commands: "M 4 4 L 20 20 M 20 4 L 4 20";
|
||||
stroke: root.focus-index == -1 || x-area.has-hover ? Theme.text : Theme.muted;
|
||||
stroke-width: 2px * Theme.s;
|
||||
}
|
||||
x-area := TouchArea {
|
||||
clicked => { root.exit(); }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1419,7 +1429,7 @@ export component AppWindow inherits Window {
|
||||
search.focus-input();
|
||||
}
|
||||
public function focus-login(i: int) {
|
||||
// Below 0 is a saved server, above 2 a button: keys go to the scope.
|
||||
// Below 0 is the X or a saved server, 3 is Connect: keys go to the scope.
|
||||
if (i >= 3 || i < 0) {
|
||||
fs.focus();
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user