Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
T
Taiko Web
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nanahira
Taiko Web
Commits
f5d4c6bc
Commit
f5d4c6bc
authored
Apr 16, 2019
by
LoveEevee
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve gamepad layout window
parent
f05b2518
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
32 additions
and
14 deletions
+32
-14
public/src/css/view.css
public/src/css/view.css
+17
-5
public/src/js/settings.js
public/src/js/settings.js
+7
-5
public/src/views/settings.html
public/src/views/settings.html
+7
-3
public/src/views/tutorial.html
public/src/views/tutorial.html
+1
-1
No files found.
public/src/css/view.css
View file @
f5d4c6bc
...
...
@@ -164,7 +164,8 @@ kbd{
}
.view-content
:not
(
:hover
)
.setting-box.selected
.setting-name
,
.view-outer
:not
(
.settings-outer
)
.setting-box.selected
.setting-name
,
.setting-box
:hover
.setting-name
{
.setting-box
:hover
.setting-name
,
.setting-box
:hover
#gamepad-value
{
color
:
#fff
;
z-index
:
0
;
}
...
...
@@ -210,15 +211,19 @@ kbd{
right
:
0
;
bottom
:
0
;
left
:
0
;
width
:
550px
;
height
:
417px
;
width
:
574px
;
height
:
428px
;
max-height
:
calc
(
100vh
-
14em
+
88px
);
}
#settings-gamepad
.setting-box
{
height
:
auto
;
}
#gamepad-bg
{
position
:
relative
;
width
:
550px
;
height
:
317px
;
max-height
:
none
;
background-repeat
:
no
ne
;
background-repeat
:
no
-repeat
;
text-align
:
center
;
font-size
:
1.4em
;
cursor
:
pointer
;
...
...
@@ -230,6 +235,13 @@ kbd{
width
:
282px
;
height
:
131px
;
background-position
:
0
-318px
;
background-repeat
:
no
ne
;
background-repeat
:
no
-repeat
;
pointer-events
:
none
;
}
#gamepad-value
{
position
:
relative
;
margin-top
:
1em
;
}
#gamepad-value
::before
{
left
:
auto
;
}
public/src/js/settings.js
View file @
f5d4c6bc
...
...
@@ -227,8 +227,8 @@ class SettingsView{
this
.
gamepadTitle
=
this
.
gamepadSettings
.
getElementsByClassName
(
"
view-title
"
)[
0
]
this
.
gamepadEndButton
=
this
.
gamepadSettings
.
getElementsByClassName
(
"
view-end-button
"
)[
0
]
this
.
addTouch
(
this
.
gamepadEndButton
,
event
=>
this
.
gamepadBack
(
true
))
this
.
gamepadB
g
=
document
.
getElementById
(
"
gamepad-bg
"
)
this
.
addTouch
(
this
.
gamepadB
g
,
event
=>
this
.
gamepadSet
(
1
))
this
.
gamepadB
ox
=
this
.
gamepadSettings
.
getElementsByClassName
(
"
setting-box
"
)[
0
]
this
.
addTouch
(
this
.
gamepadB
ox
,
event
=>
this
.
gamepadSet
(
1
))
this
.
gamepadButtons
=
document
.
getElementById
(
"
gamepad-buttons
"
)
this
.
gamepadValue
=
document
.
getElementById
(
"
gamepad-value
"
)
...
...
@@ -425,7 +425,9 @@ class SettingsView{
assets
.
sounds
[
"
se_ka
"
].
play
()
}
var
opt
=
current
.
options
[
this
.
gamepadSelected
]
this
.
gamepadValue
.
innerText
=
strings
.
settings
[
selected
.
id
][
opt
]
var
value
=
strings
.
settings
[
selected
.
id
][
opt
]
this
.
gamepadValue
.
innerText
=
value
this
.
gamepadValue
.
setAttribute
(
"
alt
"
,
value
)
this
.
gamepadButtons
.
style
.
backgroundPosition
=
"
0
"
+
(
-
318
-
132
*
this
.
gamepadSelected
)
+
"
px
"
this
.
gamepadSettings
.
style
.
display
=
"
block
"
}
...
...
@@ -513,14 +515,14 @@ class SettingsView{
}
this
.
removeTouch
(
this
.
gamepadSettings
)
this
.
removeTouch
(
this
.
gamepadEndButton
)
this
.
removeTouch
(
this
.
gamepadB
g
)
this
.
removeTouch
(
this
.
gamepadB
ox
)
delete
this
.
tutorialTitle
delete
this
.
endButton
delete
this
.
items
delete
this
.
gamepadSettings
delete
this
.
gamepadTitle
delete
this
.
gamepadEndButton
delete
this
.
gamepadB
g
delete
this
.
gamepadB
ox
delete
this
.
gamepadButtons
delete
this
.
gamepadValue
if
(
this
.
resolution
!==
settings
.
getItem
(
"
resolution
"
)){
...
...
public/src/views/settings.html
View file @
f5d4c6bc
...
...
@@ -9,10 +9,14 @@
<div
class=
"view-outer shadow-outer"
id=
"settings-gamepad"
>
<div
class=
"view"
>
<div
class=
"view-title stroke-sub"
></div>
<div
id=
"gamepad-bg"
class=
"view-content"
>
<span
id=
"gamepad-value"
></span>
<div
class=
"view-content"
>
<div
class=
"setting-box"
>
<div
id=
"gamepad-bg"
>
<div
id=
"gamepad-value"
class=
"stroke-sub"
></div>
<div
id=
"gamepad-buttons"
></div>
</div>
</div>
</div>
<div
class=
"view-end-button taibtn stroke-sub selected"
></div>
</div>
</div>
...
...
public/src/views/tutorial.html
View file @
f5d4c6bc
<div
class=
"view-outer"
>
<div
class=
"view"
>
<div
class=
"view-title
"
class=
"
stroke-sub"
></div>
<div
class=
"view-title
stroke-sub"
></div>
<div
class=
"view-content"
></div>
<div
class=
"view-end-button taibtn stroke-sub selected"
></div>
</div>
...
...
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