Merge branch '973-zvuk-zmeny-hlasitosti' into 'V3.7'

#973 Fixed double sound in desktop mode.

See merge request !760

core/src/cz/nic/tablexia/menu/AbstractMenu.java

@@ -51,13 +51,11 @@ import cz.nic.tablexia.loader.application.ApplicationFontManager;
 import cz.nic.tablexia.loader.application.ApplicationInternalSoundManager;
 import cz.nic.tablexia.menu.main.locale.LocaleSelectBox;
 import cz.nic.tablexia.menu.main.sound.VolumeBar;
-import cz.nic.tablexia.menu.main.sound.VolumeBar;
 import cz.nic.tablexia.screen.AbstractTablexiaScreen;
 import cz.nic.tablexia.menu.main.sound.SoundMuteButton;
 import cz.nic.tablexia.util.Log;
 import cz.nic.tablexia.util.ui.TablexiaLabel;
 import cz.nic.tablexia.util.ui.TablexiaNoBlendingImage;
-import cz.nic.tablexia.util.ui.scrollpane.ScrollPaneWithBars;
 
 /**
  * Abstract Tablexia menu
@@ -161,7 +159,7 @@ public abstract class AbstractMenu extends Stack implements Disposable {
     public static final float                               APP_NAME_TEXT_PADDING_LEFT      = 10f;
     public static final float                               SOUND_MUTE_BUTTON_PADDING_LEFT  = 5f;
 
-    public static final int                                SELECTBOX_LOCALE_HEIGHT         = 40;
+    public static final int                                 SELECTBOX_LOCALE_HEIGHT         = 40;
     private static final float                              SELECTBOX_LOCALE_WIDTH_RATIO    = 0.5f;
     private static final ApplicationFontManager.FontType    APP_NAME_TEXT_FONT          = ApplicationFontManager.FontType.REGULAR_10;
     private static final int                                APP_NAME_TEXT_ALIGN             = Align.center;

core/src/cz/nic/tablexia/menu/main/sound/VolumeBar.java

@@ -93,7 +93,6 @@ public class VolumeBar extends SoundMuteButton {
             public void clicked(InputEvent event, float x, float y) {
                 TablexiaSettings.getInstance().increaseSoundLevel();
                 updateVolumeBar();
-                super.clicked(event, x, y);
             }
         });
 
@@ -102,7 +101,6 @@ public class VolumeBar extends SoundMuteButton {
             public void clicked(InputEvent event, float x, float y) {
                 TablexiaSettings.getInstance().decreaseSoundLevel();
                 updateVolumeBar();
-                super.clicked(event, x, y);
             }
         });
 
@@ -171,6 +169,7 @@ public class VolumeBar extends SoundMuteButton {
                 if (event.getListenerActor().equals(buttonGroup)) {
                     buttonClickAction();
                 }
+                super.clicked(event, x, y);
             }
         };
     }

core/src/cz/nic/tablexia/screen/createuser/FormScreen.java

@@ -104,7 +104,6 @@ import cz.nic.tablexia.util.ui.dialog.components.TextContentDialogComponent;
 import cz.nic.tablexia.util.ui.dialog.components.TouchCloseDialogComponent;
 import cz.nic.tablexia.util.ui.dialog.components.TwoButtonContentDialogComponent;
 import cz.nic.tablexia.util.ui.dialog.components.ViewportMaximumSizeComponent;
-import javafx.scene.control.Tab;
 
 public class FormScreen extends AbstractTablexiaScreen<Void> {
     public static final String SCENARIO_STEP_FORM_SCENE_VISIBLE     = "form scene visible";