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

Gui layout tweaks #3077

Merged
merged 5 commits into from
Aug 16, 2019
Merged

Gui layout tweaks #3077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7e7d956
Dynamic list view size in accounts view
freimair Aug 13, 2019
637071c
Dynamic list view size in Dao network monitor view
freimair Aug 13, 2019
3018417
Dynamic list view size for asset listing fee
freimair Aug 13, 2019
8821cdc
Dynamic list view sizes for DAO bonding tab
freimair Aug 13, 2019
cb77417
Add minheight to prevent truncation
freimair Aug 14, 2019
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
2 changes: 2 additions & 0 deletions desktop/src/main/java/bisq/desktop/main/account/AccountView.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,13 @@
xmlns:fx="http://javafx.com/fxml">
<Tab fx:id="fiatAccountsTab" closable="false">
<ScrollPane fitToWidth="true" hbarPolicy="NEVER"
fitToHeight="true"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"/>
</Tab>
<Tab fx:id="altcoinAccountsTab" closable="false">
<ScrollPane fitToWidth="true" hbarPolicy="NEVER"
fitToHeight="true"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"/>
</Tab>
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ protected void buildForm() {

Tuple3<Label, ListView<PaymentAccount>, VBox> tuple = addTopLabelListView(root, gridRow, Res.get("account.altcoin.yourAltcoinAccounts"), Layout.FIRST_ROW_DISTANCE);
paymentAccountsListView = tuple.second;
paymentAccountsListView.setPrefHeight(2 * Layout.LIST_ROW_HEIGHT + 14);
paymentAccountsListView.setMinHeight(2 * Layout.LIST_ROW_HEIGHT + 14);
setPaymentAccountsCellFactory();
freimair marked this conversation as resolved.
Show resolved Hide resolved

Tuple3<Button, Button, Button> tuple3 = add3ButtonsAfterGroup(root, ++gridRow, Res.get("shared.addNewAccount"),
Expand Down
2 changes: 1 addition & 1 deletion desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ protected void buildForm() {

Tuple3<Label, ListView<PaymentAccount>, VBox> tuple = addTopLabelListView(root, gridRow, Res.get("account.fiat.yourFiatAccounts"), Layout.FIRST_ROW_DISTANCE);
paymentAccountsListView = tuple.second;
paymentAccountsListView.setPrefHeight(2 * Layout.LIST_ROW_HEIGHT + 14);
paymentAccountsListView.setMinHeight(2 * Layout.LIST_ROW_HEIGHT + 14);
setPaymentAccountsCellFactory();

Tuple3<Button, Button, Button> tuple3 = add3ButtonsAfterGroup(root, ++gridRow, Res.get("shared.addNewAccount"),
Expand Down
1 change: 1 addition & 0 deletions desktop/src/main/java/bisq/desktop/main/dao/bonding/BondingView.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
AnchorPane.topAnchor="15"/>

<ScrollPane fitToWidth="true" hbarPolicy="NEVER"
fitToHeight="true"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="270.0"
AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<AnchorPane fx:id="content" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
Expand Down
2 changes: 2 additions & 0 deletions desktop/src/main/java/bisq/desktop/main/dao/bonding/bonds/BondsView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
import javafx.scene.control.TableView;
import javafx.scene.control.Tooltip;
import javafx.scene.layout.GridPane;
import javafx.scene.layout.Priority;

import javafx.beans.property.ReadOnlyObjectWrapper;

Expand Down Expand Up @@ -98,6 +99,7 @@ private BondsView(BsqFormatter bsqFormatter,
public void initialize() {
tableView = FormBuilder.addTableViewWithHeader(root, ++gridRow, Res.get("dao.bond.allBonds.header"), "last");
tableView.setItems(sortedList);
GridPane.setVgrow(tableView, Priority.ALWAYS);
addColumns();

bondedReputationListener = c -> updateList();
Expand Down
2 changes: 2 additions & 0 deletions desktop/src/main/java/bisq/desktop/main/dao/bonding/reputation/MyReputationView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
import javafx.scene.control.TableView;
import javafx.scene.control.Tooltip;
import javafx.scene.layout.GridPane;
import javafx.scene.layout.Priority;

import javafx.beans.property.ReadOnlyObjectWrapper;
import javafx.beans.value.ChangeListener;
Expand Down Expand Up @@ -147,6 +148,7 @@ public void initialize() {
tableView = FormBuilder.addTableViewWithHeader(root, ++gridRow, Res.get("dao.bond.reputation.table.header"), 20, "last");
createColumns();
tableView.setItems(sortedList);
GridPane.setVgrow(tableView, Priority.ALWAYS);

createListeners();
}
Expand Down
3 changes: 2 additions & 1 deletion desktop/src/main/java/bisq/desktop/main/dao/bonding/roles/RolesView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import javafx.scene.control.TableView;
import javafx.scene.control.Tooltip;
import javafx.scene.layout.GridPane;
import javafx.scene.layout.Priority;

import javafx.beans.property.ReadOnlyObjectWrapper;

Expand Down Expand Up @@ -96,7 +97,7 @@ public void initialize() {
tableView = FormBuilder.addTableViewWithHeader(root, gridRow, Res.get("dao.bond.bondedRoles"), "last");
createColumns();
tableView.setItems(sortedList);

GridPane.setVgrow(tableView, Priority.ALWAYS);
bondedRoleListChangeListener = c -> updateList();
}

Expand Down
1 change: 1 addition & 0 deletions desktop/src/main/java/bisq/desktop/main/dao/burnbsq/BurnBsqView.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
AnchorPane.topAnchor="15"/>

<ScrollPane fitToWidth="true" hbarPolicy="NEVER"
fitToHeight="true"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="270.0"
AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<AnchorPane fx:id="content" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
Expand Down
1 change: 1 addition & 0 deletions desktop/src/main/java/bisq/desktop/main/dao/monitor/MonitorView.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
AnchorPane.topAnchor="15"/>

<ScrollPane fitToWidth="true" hbarPolicy="NEVER"
fitToHeight="true"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="270.0"
AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<AnchorPane fx:id="content" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
Expand Down
4 changes: 3 additions & 1 deletion desktop/src/main/java/bisq/desktop/main/dao/monitor/StateMonitorView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@ private void createTableView() {
createColumns();
GridPane.setRowIndex(tableView, gridRow);
GridPane.setHgrow(tableView, Priority.ALWAYS);
GridPane.setVgrow(tableView, Priority.SOMETIMES);
GridPane.setMargin(tableView, new Insets(Layout.FIRST_ROW_AND_GROUP_DISTANCE, -10, -25, -10));
root.getChildren().add(tableView);

Expand All @@ -267,7 +268,8 @@ private void createDetailsView() {
createConflictColumns();
GridPane.setRowIndex(conflictTableView, gridRow);
GridPane.setHgrow(conflictTableView, Priority.ALWAYS);
GridPane.setMargin(conflictTableView, new Insets(Layout.FIRST_ROW_AND_GROUP_DISTANCE, -10, -25, -10));
GridPane.setVgrow(conflictTableView, Priority.SOMETIMES);
GridPane.setMargin(conflictTableView, new Insets(Layout.FIRST_ROW_AND_GROUP_DISTANCE, -10, 5, -10));
root.getChildren().add(conflictTableView);

conflictTableView.setItems(sortedConflictList);
Expand Down