Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move autimatic steamvr tracker assignment checkbox first #1299

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 29 additions & 28 deletions gui/src/components/settings/pages/GeneralSettings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,35 @@ export function GeneralSettings() {
</Typography>
))}
</div>
<div className="grid grid-cols-2 gap-3 pt-3">
<div className="flex flex-col pt-4"></div>
<Typography bold>
{l10n.getString(
'settings-general-steamvr-trackers-tracker_toggling'
)}
</Typography>
<div className="flex flex-col pt-2 pb-4">
{l10n
.getString(
'settings-general-steamvr-trackers-tracker_toggling-description'
)
.split('\n')
.map((line, i) => (
<Typography color="secondary" key={i}>
{line}
</Typography>
))}
</div>
<CheckBox
variant="toggle"
outlined
control={control}
name="trackers.automaticTrackerToggle"
label={l10n.getString(
'settings-general-steamvr-trackers-tracker_toggling-label'
)}
/>
<div className="flex flex-col pt-4"></div>
<div className="grid grid-cols-2 gap-3">
<CheckBox
variant="toggle"
outlined
Expand Down Expand Up @@ -585,33 +613,6 @@ export function GeneralSettings() {
)}
/>
</div>
<div className="flex flex-col pt-4 pb-4"></div>
<Typography bold>
{l10n.getString(
'settings-general-steamvr-trackers-tracker_toggling'
)}
</Typography>
<div className="flex flex-col pt-2 pb-4">
{l10n
.getString(
'settings-general-steamvr-trackers-tracker_toggling-description'
)
.split('\n')
.map((line, i) => (
<Typography color="secondary" key={i}>
{line}
</Typography>
))}
</div>
<CheckBox
variant="toggle"
outlined
control={control}
name="trackers.automaticTrackerToggle"
label={l10n.getString(
'settings-general-steamvr-trackers-tracker_toggling-label'
)}
/>
</>
</SettingsPagePaneLayout>
<SettingsPagePaneLayout icon={<WrenchIcon></WrenchIcon>} id="mechanics">
Expand Down