Merge branch 'develop' into f/UserFriendlySettings

This commit is contained in:
DieGurke 2019-12-21 12:35:38 +01:00 committed by GitHub
commit 941d8266bc

View File

@ -25,6 +25,7 @@ import envoy.client.util.EnvoyLog;
* Created: <strong>20 Dec 2019</strong><br> * Created: <strong>20 Dec 2019</strong><br>
* *
* @author Kai S. K. Engelbart * @author Kai S. K. Engelbart
* @author Maximilian K&auml;fer
* @since Envoy v0.2-alpha * @since Envoy v0.2-alpha
*/ */
public class ThemeCustomizationPanel extends SettingsPanel { public class ThemeCustomizationPanel extends SettingsPanel {
@ -83,10 +84,6 @@ public class ThemeCustomizationPanel extends SettingsPanel {
gbc_themes.insets = new Insets(10, 10, 20, 10); gbc_themes.insets = new Insets(10, 10, 20, 10);
add(themes, gbc_themes); add(themes, gbc_themes);
// colorsPanel.setLayout(new BoxLayout(colorsPanel, BoxLayout.Y_AXIS));
// colorsPanel.setAlignmentX(Component.LEFT_ALIGNMENT);
GridBagLayout gbl_colorCustomizations = new GridBagLayout(); GridBagLayout gbl_colorCustomizations = new GridBagLayout();
gbl_colorCustomizations.columnWidths = new int[] { 1, 1 }; gbl_colorCustomizations.columnWidths = new int[] { 1, 1 };