Skip to content

Commit

Permalink
0004943: Prevented SQL explorer menu bar icons from growing in size
Browse files Browse the repository at this point in the history
  • Loading branch information
@evan-miller-jumpmind
evan-miller-jumpmind committed Oct 6, 2021
1 parent 8064bab commit af1b700
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 11 deletions.
7 changes: 7 additions & 0 deletions symmetric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/common/CommonUiUtils.java
View file
Expand Up @@ -476,4 +476,11 @@ public static void configureEditor(Grid<?> grid) {
Div buttons = new Div(save, cancel);
editorColumn.setEditorComponent(buttons);
}

public static Icon createMenuBarIcon(VaadinIcon icon) {
Icon menuBarIcon = new Icon(icon);
menuBarIcon.getStyle().set("padding", "var(--lumo-space-xs)");
menuBarIcon.getStyle().set("box-sizing", "border-box");
return menuBarIcon;
}
}
18 changes: 12 additions & 6 deletions symmetric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/sqlexplorer/DefaultButtonBar.java
View file
Expand Up @@ -22,6 +22,8 @@

import java.io.Serializable;

import org.jumpmind.vaadin.ui.common.CommonUiUtils;

import com.vaadin.flow.component.contextmenu.MenuItem;
import com.vaadin.flow.component.contextmenu.SubMenu;
import com.vaadin.flow.component.html.Span;
Expand Down Expand Up @@ -91,28 +93,32 @@ public void setRollbackButtonEnabled(boolean enabled) {
}

protected void populate(MenuBar menuBar) {
executeAtCursorButton = menuBar.addItem(new Icon(VaadinIcon.PLAY), event -> queryPanel.requestExecutionAtCursor());
executeAtCursorButton = menuBar.addItem(CommonUiUtils.createMenuBarIcon(VaadinIcon.PLAY),
event -> queryPanel.requestExecutionAtCursor());
executeAtCursorButton.getElement().setAttribute("title", "Run sql under cursor (CTRL+ENTER)");

executeScriptButton = menuBar.addItem(new Icon(VaadinIcon.FORWARD), event -> queryPanel.requestScriptExecution());
executeScriptButton = menuBar.addItem(CommonUiUtils.createMenuBarIcon(VaadinIcon.FORWARD),
event -> queryPanel.requestScriptExecution());
executeScriptButton.getElement().setAttribute("title", "Run as script");

commitButton = menuBar.addItem(new Icon(VaadinIcon.ARROW_CIRCLE_RIGHT_O), event -> queryPanel.commit());
commitButton = menuBar.addItem(CommonUiUtils.createMenuBarIcon(VaadinIcon.ARROW_CIRCLE_RIGHT_O),
event -> queryPanel.commit());
commitButton.getElement().getClassList().add("green");
commitButton.getElement().setAttribute("title", "Commit");
commitButton.setEnabled(false);

rollbackButton = menuBar.addItem(new Icon(VaadinIcon.ARROW_CIRCLE_LEFT_O), event -> queryPanel.rollback());
rollbackButton = menuBar.addItem(CommonUiUtils.createMenuBarIcon(VaadinIcon.ARROW_CIRCLE_LEFT_O),
event -> queryPanel.rollback());
rollbackButton.getElement().getClassList().add("red");
rollbackButton.getElement().setAttribute("title", "Rollback");
rollbackButton.setEnabled(false);

historyButton = menuBar.addItem(new Icon(VaadinIcon.SEARCH),
historyButton = menuBar.addItem(CommonUiUtils.createMenuBarIcon(VaadinIcon.SEARCH),
event -> new SqlHistoryDialog(settingsProvider, queryPanel).showAtSize(0.6));
historyButton.getElement().setAttribute("title", "Sql History");
historyButton.setEnabled(true);

MenuItem optionsButton = menuBar.addItem(new Icon(VaadinIcon.TASKS), null);
MenuItem optionsButton = menuBar.addItem(CommonUiUtils.createMenuBarIcon(VaadinIcon.TASKS), null);
optionsButton.getElement().setAttribute("title", "Options");

SubMenu optionsSubMenu = optionsButton.getSubMenu();
Expand Down
11 changes: 6 additions & 5 deletions symmetric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/sqlexplorer/SqlExplorer.java
View file
Expand Up @@ -190,15 +190,15 @@ protected MenuBar buildLeftMenu() {
MenuBar leftMenu = new MenuBar();
leftMenu.addThemeVariants(MenuBarVariant.LUMO_TERTIARY);
leftMenu.setWidthFull();
MenuItem hideButton = leftMenu.addItem(new Icon(VaadinIcon.MENU), event -> {
MenuItem hideButton = leftMenu.addItem(CommonUiUtils.createMenuBarIcon(VaadinIcon.MENU), event -> {
savedSplitPosition = this.getSplitterPosition() > 10 ? this.getSplitterPosition(): DEFAULT_SPLIT_POS;
setSplitterPosition(0);
setPrimaryStyle("max-width", "0%");
showButton.setVisible(true);
});
hideButton.getElement().setAttribute("title", "Hide the database explorer");

MenuItem refreshButton = leftMenu.addItem(new Icon(VaadinIcon.REFRESH), event -> {
MenuItem refreshButton = leftMenu.addItem(CommonUiUtils.createMenuBarIcon(VaadinIcon.REFRESH), event -> {
dbTree.refresh(true);
Component tab = contentTabs.getSelectedTab();
if (tab instanceof QueryPanel) {
Expand All @@ -209,7 +209,7 @@ protected MenuBar buildLeftMenu() {
});
refreshButton.getElement().setAttribute("title", "Refresh the database explorer");

MenuItem selectionMode = leftMenu.addItem(new Icon(VaadinIcon.GRID_BIG_O), event -> {
MenuItem selectionMode = leftMenu.addItem(CommonUiUtils.createMenuBarIcon(VaadinIcon.GRID_BIG_O), event -> {
MenuItem source = event.getSource();
source.removeAll();
if (dbTree.getSelectionModel() instanceof GridMultiSelectionModel) {
Expand All @@ -227,10 +227,11 @@ protected MenuBar buildLeftMenu() {
});
selectionMode.getElement().setAttribute("title", "Switch to multi-select mode");

MenuItem openQueryTab = leftMenu.addItem(new Icon(QUERY_ICON), event -> openQueryWindow(dbTree.getSelectedItems()));
MenuItem openQueryTab = leftMenu.addItem(CommonUiUtils.createMenuBarIcon(QUERY_ICON),
event -> openQueryWindow(dbTree.getSelectedItems()));
openQueryTab.getElement().setAttribute("title", "Open a query tab");

MenuItem settings = leftMenu.addItem(new Icon(VaadinIcon.COG), event -> {
MenuItem settings = leftMenu.addItem(CommonUiUtils.createMenuBarIcon(VaadinIcon.COG), event -> {
SettingsDialog dialog = new SettingsDialog(SqlExplorer.this);
dialog.show();
});
Expand Down

0 comments on commit af1b700

Please sign in to comment.