OLD | NEW |
1 <link rel="import" href="chrome://resources/cr_elements/cr_slider/cr_slider.html
"> | 1 <link rel="import" href="chrome://resources/cr_elements/cr_slider/cr_slider.html
"> |
2 <link rel="import" href="chrome://resources/html/polymer.html"> | 2 <link rel="import" href="chrome://resources/html/polymer.html"> |
3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-button/pape
r-radio-button.html"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-button/pape
r-radio-button.html"> |
4 <link rel="import" href="/controls/settings_checkbox.html"> | |
5 <link rel="import" href="/controls/settings_radio_group.html"> | 4 <link rel="import" href="/controls/settings_radio_group.html"> |
| 5 <link rel="import" href="/controls/settings_toggle_button.html"> |
6 <link rel="import" href="/device_page/device_page_browser_proxy.html"> | 6 <link rel="import" href="/device_page/device_page_browser_proxy.html"> |
7 <link rel="import" href="/settings_shared_css.html"> | 7 <link rel="import" href="/settings_shared_css.html"> |
8 | 8 |
9 <dom-module id="settings-pointers"> | 9 <dom-module id="settings-pointers"> |
10 <template> | 10 <template> |
11 <style include="settings-shared"> | 11 <style include="settings-shared"> |
12 h2 { | 12 h2 { |
13 -webkit-padding-start: var(--settings-box-row-padding); | 13 -webkit-padding-start: var(--settings-box-row-padding); |
14 } | 14 } |
15 | 15 |
16 /* Indent layout elements under .subsection, using margin instead of | 16 /* Indent layout elements under .subsection, using margin instead of |
17 * padding so the borders line up. */ | 17 * padding so the borders line up. */ |
18 .subsection > .settings-box { | 18 .subsection > .settings-box { |
19 margin: 0 calc( | 19 margin: 0 calc( |
20 var(--settings-box-row-padding) + var(--settings-indent-width)); | 20 var(--settings-box-row-padding) + var(--settings-indent-width)); |
21 padding: 0; | 21 padding: 0; |
22 } | 22 } |
23 | 23 |
24 .subsection > .list-frame { | 24 .subsection > .list-frame { |
25 -webkit-margin-start: var(--settings-indent-width); | 25 -webkit-margin-start: var(--settings-indent-width); |
26 } | 26 } |
27 </style> | 27 </style> |
28 <div id="mouse" hidden$="[[!hasMouse]]" | 28 <div id="mouse" hidden$="[[!hasMouse]]" |
29 class$="[[getSubsectionClass_(hasMouse, hasTouchpad)]]"> | 29 class$="[[getSubsectionClass_(hasMouse, hasTouchpad)]]"> |
30 <!-- Subsection title only appears if both mouse and touchpad exist. --> | 30 <!-- Subsection title only appears if both mouse and touchpad exist. --> |
31 <h2 hidden$="[[!hasTouchpad]]">$i18n{mouseTitle}</h2> | 31 <h2 hidden$="[[!hasTouchpad]]">$i18n{mouseTitle}</h2> |
32 <div class="settings-box first"> | 32 <div class="settings-box first"> |
33 <settings-checkbox pref="{{prefs.settings.mouse.primary_right}}" | 33 <settings-toggle-button class="start" |
| 34 pref="{{prefs.settings.mouse.primary_right}}" |
34 label="$i18n{mouseSwapButtons}"> | 35 label="$i18n{mouseSwapButtons}"> |
35 </settings-checkbox> | 36 </settings-toggle-button> |
36 </div> | 37 </div> |
37 <div class="settings-box"> | 38 <div class="settings-box"> |
38 <div class="start" id="mouseSpeedLabel">$i18n{mouseSpeed}</div> | 39 <div class="start" id="mouseSpeedLabel">$i18n{mouseSpeed}</div> |
39 <cr-slider value="{{prefs.settings.mouse.sensitivity2.value}}" | 40 <cr-slider value="{{prefs.settings.mouse.sensitivity2.value}}" |
40 tick-values="[[sensitivityValues_]]" | 41 tick-values="[[sensitivityValues_]]" |
41 aria-labelledby="mouseSpeedLabel" | 42 aria-labelledby="mouseSpeedLabel" |
42 label-min="$i18n{pointerSlow}" | 43 label-min="$i18n{pointerSlow}" |
43 label-max="$i18n{pointerFast}"> | 44 label-max="$i18n{pointerFast}"> |
44 </cr-slider> | 45 </cr-slider> |
45 </div> | 46 </div> |
46 </div> | 47 </div> |
47 <div id="touchpad" hidden$="[[!hasTouchpad]]" | 48 <div id="touchpad" hidden$="[[!hasTouchpad]]" |
48 class$="[[getSubsectionClass_(hasMouse, hasTouchpad)]]"> | 49 class$="[[getSubsectionClass_(hasMouse, hasTouchpad)]]"> |
49 <!-- Subsection title only appears if both mouse and touchpad exist. --> | 50 <!-- Subsection title only appears if both mouse and touchpad exist. --> |
50 <h2 hidden$="[[!hasMouse]]">$i18n{touchpadTitle}</h2> | 51 <h2 hidden$="[[!hasMouse]]">$i18n{touchpadTitle}</h2> |
51 <div class="settings-box block first"> | 52 <div class="settings-box block first"> |
52 <settings-checkbox id="enableTapToClick" | 53 <settings-toggle-button id="enableTapToClick" |
53 pref="{{prefs.settings.touchpad.enable_tap_to_click}}" | 54 pref="{{prefs.settings.touchpad.enable_tap_to_click}}" |
54 label="$i18n{touchpadTapToClickEnabledLabel}"> | 55 label="$i18n{touchpadTapToClickEnabledLabel}"> |
55 </settings-checkbox> | 56 </settings-toggle-button> |
56 <settings-checkbox id="enableTapDragging" | 57 <settings-toggle-button id="enableTapDragging" |
57 pref="{{prefs.settings.touchpad.enable_tap_dragging}}" | 58 pref="{{prefs.settings.touchpad.enable_tap_dragging}}" |
58 label="$i18n{tapDraggingLabel}"> | 59 label="$i18n{tapDraggingLabel}"> |
59 </settings-checkbox> | 60 </settings-toggle-button> |
60 </div> | 61 </div> |
61 <div class="settings-box"> | 62 <div class="settings-box"> |
62 <div class="start" id="touchpadSpeedLabel">$i18n{touchpadSpeed}</div> | 63 <div class="start" id="touchpadSpeedLabel">$i18n{touchpadSpeed}</div> |
63 <cr-slider id="touchpadSensitivity" | 64 <cr-slider id="touchpadSensitivity" |
64 value="{{prefs.settings.touchpad.sensitivity2.value}}" | 65 value="{{prefs.settings.touchpad.sensitivity2.value}}" |
65 tick-values="[[sensitivityValues_]]" | 66 tick-values="[[sensitivityValues_]]" |
66 aria-labelledby="touchpadSpeedLabel" | 67 aria-labelledby="touchpadSpeedLabel" |
67 label-min="$i18n{pointerSlow}" | 68 label-min="$i18n{pointerSlow}" |
68 label-max="$i18n{pointerFast}"> | 69 label-max="$i18n{pointerFast}"> |
69 </cr-slider> | 70 </cr-slider> |
(...skipping 11 matching lines...) Expand all Loading... |
81 on-keydown="onLearnMoreLinkActivated_"> | 82 on-keydown="onLearnMoreLinkActivated_"> |
82 $i18n{naturalScrollLearnMore} | 83 $i18n{naturalScrollLearnMore} |
83 </a> | 84 </a> |
84 </paper-radio-button> | 85 </paper-radio-button> |
85 </settings-radio-group> | 86 </settings-radio-group> |
86 </div> | 87 </div> |
87 </div> | 88 </div> |
88 </template> | 89 </template> |
89 <script src="pointers.js"></script> | 90 <script src="pointers.js"></script> |
90 </dom-module> | 91 </dom-module> |
OLD | NEW |