Skip to content

Commit 401e88e

Browse files
pcastorniipcastornii
committed
Make cross button extra small
1 parent 5fadf79 commit 401e88e

17 files changed

Lines changed: 122 additions & 93 deletions

File tree

‎tabshell-core/src/main/java/com/techsenger/tabshell/core/dialog/AbstractDialogFxView.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ protected void build() {
286286

287287
this.titleButtonBox.getStyleClass().add("button-box");
288288
this.titleButtonBox.setAlignment(Pos.CENTER);
289-
closeButton.getStyleClass().addAll(Styles.FLAT, StyleClasses.ICON_BUTTON, StyleClasses.SIZE_XS);
289+
closeButton.getStyleClass().addAll(Styles.FLAT, StyleClasses.ICON_BUTTON, StyleClasses.SIZE_S);
290290

291291
super.getNode().getChildren().clear();
292292
super.getNode().getChildren().add(mainBox);

‎tabshell-core/src/main/java/com/techsenger/tabshell/core/window/AbstractWindowFxView.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -406,9 +406,9 @@ protected DialogManager getDialogManager() {
406406
@Override
407407
protected void build() {
408408
super.build();
409-
this.closeButton.getStyleClass().addAll(Styles.FLAT, StyleClasses.ICON_BUTTON, StyleClasses.SIZE_XS);
410-
this.minimizeButton.getStyleClass().addAll(Styles.FLAT, StyleClasses.ICON_BUTTON, StyleClasses.SIZE_XS);
411-
this.maximizeButton.getStyleClass().addAll(Styles.FLAT, StyleClasses.ICON_BUTTON, StyleClasses.SIZE_XS);
409+
this.closeButton.getStyleClass().addAll(Styles.FLAT, StyleClasses.ICON_BUTTON, StyleClasses.SIZE_S);
410+
this.minimizeButton.getStyleClass().addAll(Styles.FLAT, StyleClasses.ICON_BUTTON, StyleClasses.SIZE_S);
411+
this.maximizeButton.getStyleClass().addAll(Styles.FLAT, StyleClasses.ICON_BUTTON, StyleClasses.SIZE_S);
412412
this.windowBox.getStyleClass().add("window-box");
413413
this.leftBox.getStyleClass().add("left-box");
414414
this.titleBar.getStyleClass().add("title-bar");

‎tabshell-demo/src/main/java/com/techsenger/tabshell/demo/browser/BrowserMainTabFxView.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,9 @@ protected Composer createComposer() {
102102
protected void build() {
103103
super.build();
104104
var removeButton = new Button(null, new FontIconView(new FontIcon(983924)));
105-
removeButton.getStyleClass().addAll(StyleClasses.ICON_BUTTON, StyleClasses.SIZE_M);
105+
removeButton.getStyleClass().addAll(StyleClasses.ICON_BUTTON, StyleClasses.SIZE_L);
106106
var addButton = new Button(null, new FontIconView(new FontIcon(984085)));
107-
addButton.getStyleClass().addAll(StyleClasses.ICON_BUTTON, StyleClasses.SIZE_M);
107+
addButton.getStyleClass().addAll(StyleClasses.ICON_BUTTON, StyleClasses.SIZE_L);
108108
addButton.setOnAction((e) -> {
109109
removeButton.setVisible(!removeButton.isVisible());
110110
});

‎tabshell-demo/src/main/java/com/techsenger/tabshell/demo/styles/SetPageFxView.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package com.techsenger.tabshell.demo.styles;
1818

19+
import atlantafx.base.theme.Styles;
1920
import com.techsenger.tabshell.core.page.AbstractPageFxView;
2021
import static com.techsenger.tabshell.demo.styles.StylePageData.PERSONS;
2122
import com.techsenger.tabshell.material.style.Spacing;
@@ -61,8 +62,8 @@ private static GridPane createSetPane(String styleClass) {
6162
}
6263

6364
private static VBox createLeftBox(String styleClass) {
64-
var defToolBar = NodeFactory.createToolBar(null, StyleClasses.SIZE_M);
65-
var denseToolBar = NodeFactory.createToolBar(StyleClasses.DENSE, StyleClasses.SIZE_S);
65+
var defToolBar = NodeFactory.createToolBar(null, StyleClasses.SIZE_L);
66+
var denseToolBar = NodeFactory.createToolBar(Styles.DENSE, StyleClasses.SIZE_M);
6667
GridPane grid = new GridPane();
6768
grid.setHgap(Spacing.getHorizontal());
6869
grid.setVgap(Spacing.getVertical());

‎tabshell-demo/src/main/java/com/techsenger/tabshell/demo/styles/VariantPageFxView.java‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package com.techsenger.tabshell.demo.styles;
1818

19+
import atlantafx.base.theme.Styles;
1920
import com.techsenger.tabshell.core.page.AbstractPageFxView;
2021
import static com.techsenger.tabshell.demo.styles.StylePageData.DEFAULT_STYLE_NAME;
2122
import static com.techsenger.tabshell.demo.styles.StylePageData.PERSONS;
@@ -74,12 +75,16 @@ private static VBox createIconedButtons() {
7475
}
7576

7677
private static HBox createIconedButtons(String densityStyleClass) {
77-
var w0 = wrapWithName(NodeFactory.createIconButton(StyleClasses.SIZE_XL), StyleClasses.SIZE_XL, "5em");
78-
var w1 = wrapWithName(NodeFactory.createIconButton(StyleClasses.SIZE_L), StyleClasses.SIZE_L, "5em");
79-
var w2 = wrapWithName(NodeFactory.createIconButton(StyleClasses.SIZE_M), StyleClasses.SIZE_M, "5em");
80-
var w3 = wrapWithName(NodeFactory.createIconButton(StyleClasses.SIZE_S), StyleClasses.SIZE_S, "5em");
81-
var w4 = wrapWithName(NodeFactory.createIconButton(StyleClasses.SIZE_XS), StyleClasses.SIZE_XS, "5em");
82-
var box = new HBox(w0, w1, w2, w3, w4);
78+
var w0 = wrapWithName(NodeFactory.createIconButton(StyleClasses.SIZE_XXL), StyleClasses.SIZE_XXL, "5em");
79+
var w1 = wrapWithName(NodeFactory.createIconButton(StyleClasses.SIZE_XL), StyleClasses.SIZE_XL, "5em");
80+
var w2 = wrapWithName(NodeFactory.createIconButton(StyleClasses.SIZE_L), StyleClasses.SIZE_L, "5em");
81+
var w3 = wrapWithName(NodeFactory.createIconButton(StyleClasses.SIZE_M), StyleClasses.SIZE_M, "5em");
82+
var w4 = wrapWithName(NodeFactory.createIconButton(StyleClasses.SIZE_S), StyleClasses.SIZE_S, "5em");
83+
var crossButton = NodeFactory.createIconButton(StyleClasses.SIZE_XS);
84+
crossButton.setGraphic(null);
85+
crossButton.getStyleClass().add(StyleClasses.CROSS_BUTTON);
86+
var w5 = wrapWithName(crossButton, StyleClasses.SIZE_XS, "5em");
87+
var box = new HBox(w0, w1, w2, w3, w4, w5);
8388
box.setMaxWidth(Region.USE_PREF_SIZE);
8489
box.getStyleClass().add(densityStyleClass);
8590
return box;
@@ -92,8 +97,8 @@ private static VBox createToolBars() {
9297
}
9398

9499
private static VBox createToolBars(String densityStyleClass) {
95-
var w0 = wrapWithName(NodeFactory.createToolBar(null, StyleClasses.SIZE_M), DEFAULT_STYLE_NAME);
96-
var w1 = wrapWithName(NodeFactory.createToolBar(StyleClasses.DENSE, StyleClasses.SIZE_S), StyleClasses.DENSE);
100+
var w0 = wrapWithName(NodeFactory.createToolBar(null, StyleClasses.SIZE_L), DEFAULT_STYLE_NAME);
101+
var w1 = wrapWithName(NodeFactory.createToolBar(Styles.DENSE, StyleClasses.SIZE_M), Styles.DENSE);
97102
var box = createSpacedHBox(w0, w1);
98103
return wrapWithName(box, densityStyleClass);
99104
}

‎tabshell-devtools/src/main/java/com/techsenger/tabshell/devtools/DevToolsTabDockFxView.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,9 @@ public Composer getComposer() {
160160
@Override
161161
protected void build() {
162162
super.build();
163-
selectButton.getStyleClass().addAll(StyleClasses.ICON_BUTTON, Styles.FLAT, StyleClasses.SIZE_XS);
163+
selectButton.getStyleClass().addAll(StyleClasses.ICON_BUTTON, Styles.FLAT, StyleClasses.SIZE_S);
164164
selectButton.setTooltip(new Tooltip("Select Node"));
165-
selectionButton.getStyleClass().addAll(StyleClasses.ICON_BUTTON, Styles.FLAT, StyleClasses.SIZE_XS);
165+
selectionButton.getStyleClass().addAll(StyleClasses.ICON_BUTTON, Styles.FLAT, StyleClasses.SIZE_S);
166166
selectionButton.setTooltip(new Tooltip("Enable/Disable Selection"));
167167
getTabHeaderFirstBox().getChildren().addAll(selectButton, selectionButton);
168168
getTabHeaderFirstBox().setSpacing(Spacing.getHorizontalThird());
@@ -171,7 +171,7 @@ protected void build() {
171171
getNode().setTabDragEnabled(false);
172172
getNode().setTabDropEnabled(false);
173173

174-
optionsButton.getStyleClass().addAll(StyleClasses.ICON_BUTTON, Styles.FLAT, StyleClasses.SIZE_XS);
174+
optionsButton.getStyleClass().addAll(StyleClasses.ICON_BUTTON, Styles.FLAT, StyleClasses.SIZE_S);
175175
optionsButton.setTooltip(new Tooltip("Options"));
176176
getTabHeaderLastBox().getChildren().add(0, optionsButton);
177177
getTabHeaderLastBox().setSpacing(Spacing.getHorizontalThird());

‎tabshell-devtools/src/main/java/com/techsenger/tabshell/devtools/ToolBarFxView.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,16 @@ protected void build() {
5959
HBox.setHgrow(getFindComboBoxWrapper(), Priority.ALWAYS);
6060
getFindComboBoxWrapper().setPadding(Insets.EMPTY);
6161
getFindComboBox().setMaxWidth(Double.MAX_VALUE);
62-
getFindComboBox().getStyleClass().add(StyleClasses.SIZE_S);
63-
getFindRightBox().getStyleClass().add(StyleClasses.SIZE_S);
62+
getFindComboBox().getStyleClass().add(StyleClasses.SIZE_M);
63+
getFindRightBox().getStyleClass().add(StyleClasses.SIZE_M);
6464

65-
getFindNextButton().getStyleClass().add(StyleClasses.SIZE_S);
66-
getFindPreviousButton().getStyleClass().add(StyleClasses.SIZE_S);
67-
getMatchCaseButton().getStyleClass().add(StyleClasses.SIZE_S);
68-
this.refreshButton.getStyleClass().addAll(Styles.FLAT, StyleClasses.ICON_BUTTON, StyleClasses.SIZE_S);
65+
getFindNextButton().getStyleClass().add(StyleClasses.SIZE_M);
66+
getFindPreviousButton().getStyleClass().add(StyleClasses.SIZE_M);
67+
getMatchCaseButton().getStyleClass().add(StyleClasses.SIZE_M);
68+
this.refreshButton.getStyleClass().addAll(Styles.FLAT, StyleClasses.ICON_BUTTON, StyleClasses.SIZE_M);
6969
this.refreshButton.setTooltip(new Tooltip("Refresh"));
7070

71-
this.toolBar.getStyleClass().add(StyleClasses.DENSE);
71+
this.toolBar.getStyleClass().add(Styles.DENSE);
7272
this.toolBar.getItems().addAll(getFindComboBoxWrapper());
7373
if (this.findNavigation) {
7474
this.toolBar.getItems().addAll(getFindPreviousButton(), getFindNextButton());

‎tabshell-devtools/src/main/java/com/techsenger/tabshell/devtools/event/EventToolBarFxView.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,17 +99,17 @@ public void setEventTypes(Map<Class<? extends ConnectorEvent>, AtomicBoolean> ev
9999
@Override
100100
protected void build() {
101101
super.build();
102-
this.recordButton.getStyleClass().addAll(Styles.FLAT, StyleClasses.ICON_BUTTON, StyleClasses.SIZE_S);
102+
this.recordButton.getStyleClass().addAll(Styles.FLAT, StyleClasses.ICON_BUTTON, StyleClasses.SIZE_M);
103103
this.recordButton.setTooltip(new Tooltip("Start/Stop"));
104-
this.clearButton.getStyleClass().addAll(Styles.FLAT, StyleClasses.ICON_BUTTON, StyleClasses.SIZE_S);
104+
this.clearButton.getStyleClass().addAll(Styles.FLAT, StyleClasses.ICON_BUTTON, StyleClasses.SIZE_M);
105105
this.clearButton.setTooltip(new Tooltip("Clear"));
106-
this.filterButton.getStyleClass().addAll(Styles.FLAT, StyleClasses.ICON_BUTTON, StyleClasses.SIZE_S);
106+
this.filterButton.getStyleClass().addAll(Styles.FLAT, StyleClasses.ICON_BUTTON, StyleClasses.SIZE_M);
107107
this.filterButton.setTooltip(new Tooltip("Enable/Disable Filter"));
108-
this.selectedOnlyButton.getStyleClass().addAll(Styles.FLAT, StyleClasses.ICON_BUTTON, StyleClasses.SIZE_S);
108+
this.selectedOnlyButton.getStyleClass().addAll(Styles.FLAT, StyleClasses.ICON_BUTTON, StyleClasses.SIZE_M);
109109
this.selectedOnlyButton.setTooltip(new Tooltip("Selected Node Only"));
110110

111111
// selectedOnlyButton.setOnAction(e -> this.textArea.moveDocumentEnd());
112-
eventTypesButton.getStyleClass().addAll(Styles.FLAT, StyleClasses.SIZE_S);
112+
eventTypesButton.getStyleClass().addAll(Styles.FLAT, StyleClasses.SIZE_M);
113113
var selectAllTypesItem = new MenuItem("Select All Types");
114114
selectAllTypesItem.setOnAction(e -> {
115115
for (var item : eventTypesButton.getItems()) {

‎tabshell-layout/src/main/java/com/techsenger/tabshell/layout/dockhost/SideBarFxView.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ protected void addListeners() {
302302
protected Tab createRestoreTab() {
303303
var tab = new BarRestoreTab();
304304
var button = new Button(null, new FontIconView(LayoutIcons.RESTORE_WINDOW));
305-
button.getStyleClass().addAll(StyleClasses.ICON_BUTTON, StyleClasses.SIZE_XS, Styles.FLAT);
305+
button.getStyleClass().addAll(StyleClasses.ICON_BUTTON, StyleClasses.SIZE_S, Styles.FLAT);
306306
button.setOnAction(e -> {
307307
removePopup();
308308
onRestoreButtonAction(tab);

‎tabshell-layout/src/main/java/com/techsenger/tabshell/layout/dockhost/TabDockFxView.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,10 @@ protected void build() {
142142
tabPane.setTabDragEnabled(true);
143143
tabPane.setTabDropEnabled(true);
144144

145-
this.dragIconView.getStyleClass().add(StyleClasses.SIZE_XS);
146-
minimizeButton.getStyleClass().addAll(StyleClasses.ICON_BUTTON, Styles.FLAT, StyleClasses.SIZE_XS);
145+
this.dragIconView.getStyleClass().add(StyleClasses.SIZE_S);
146+
minimizeButton.getStyleClass().addAll(StyleClasses.ICON_BUTTON, Styles.FLAT, StyleClasses.SIZE_S);
147147
minimizeButton.setTooltip(new Tooltip("Minimize"));
148-
closeButton.getStyleClass().addAll(StyleClasses.ICON_BUTTON, Styles.FLAT, StyleClasses.SIZE_XS);
148+
closeButton.getStyleClass().addAll(StyleClasses.ICON_BUTTON, Styles.FLAT, StyleClasses.SIZE_S);
149149
closeButton.setTooltip(new Tooltip("Close"));
150150

151151
this.getNode().getStyleClass().add("tab-dock");

0 commit comments

Comments
 (0)