Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Tablexia
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
17
Issues
17
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
labs
Tablexia
Commits
764671c5
Commit
764671c5
authored
Dec 12, 2018
by
Vitaliy Vashchenko
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '973-zvuk-zmeny-hlasitosti' into 'V3.7'
#973
Fixed double sound in desktop mode. See merge request
!760
parents
72a09d71
7601ab6f
Pipeline
#43175
failed with stages
in 39 minutes and 33 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
6 deletions
+2
-6
AbstractMenu.java
core/src/cz/nic/tablexia/menu/AbstractMenu.java
+1
-3
VolumeBar.java
core/src/cz/nic/tablexia/menu/main/sound/VolumeBar.java
+1
-2
FormScreen.java
core/src/cz/nic/tablexia/screen/createuser/FormScreen.java
+0
-1
No files found.
core/src/cz/nic/tablexia/menu/AbstractMenu.java
View file @
764671c5
...
...
@@ -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
=
10
f
;
public
static
final
float
SOUND_MUTE_BUTTON_PADDING_LEFT
=
5
f
;
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
View file @
764671c5
...
...
@@ -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
View file @
764671c5
...
...
@@ -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"
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment