Skip to content

Commit 6f58f1f

Browse files
Kateryna ProkopenkoDevtools-frontend LUCI CQ
authored andcommitted
[GM3Restyling] Update dropdown styles in Memory inspector
Fix settings button in Memory inspector toolbar as a drive-by Screenshot: https://imgur.com/a/to82e9d Bug: 325441856 Change-Id: I3371e2dd731b3eafe691b9818e607a84b8f0b506 Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6366954 Reviewed-by: Kim-Anh Tran <[email protected]> Auto-Submit: Kateryna Prokopenko <[email protected]> Commit-Queue: Kim-Anh Tran <[email protected]>
1 parent bdad96f commit 6f58f1f

File tree

4 files changed

+21
-11
lines changed

4 files changed

+21
-11
lines changed

front_end/panels/linear_memory_inspector/components/LinearMemoryValueInterpreter.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
renderElementIntoDOM,
99
} from '../../../testing/DOMHelpers.js';
1010
import {describeWithLocale} from '../../../testing/EnvironmentHelpers.js';
11+
import * as Buttons from '../../../ui/components/buttons/buttons.js';
1112

1213
import * as LinearMemoryInspectorComponents from './components.js';
1314

@@ -30,7 +31,7 @@ function assertDisplayRenders(component: HTMLElement) {
3031

3132
function clickSettingsButton(
3233
component: LinearMemoryInspectorComponents.LinearMemoryValueInterpreter.LinearMemoryValueInterpreter) {
33-
const settingsButton = getElementWithinComponent(component, '[data-settings]', HTMLButtonElement);
34+
const settingsButton = getElementWithinComponent(component, '[data-settings]', Buttons.Button.Button);
3435
settingsButton.click();
3536
}
3637

front_end/panels/linear_memory_inspector/components/LinearMemoryValueInterpreter.ts

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,20 @@ import './ValueInterpreterSettings.js';
88

99
import * as i18n from '../../../core/i18n/i18n.js';
1010
import * as Platform from '../../../core/platform/platform.js';
11+
import * as Buttons from '../../../ui/components/buttons/buttons.js';
12+
// eslint-disable-next-line rulesdir/es-modules-import
13+
import inspectorCommonStylesRaw from '../../../ui/legacy/inspectorCommon.css.js';
1114
import * as Lit from '../../../ui/lit/lit.js';
1215
import * as VisualLogging from '../../../ui/visual_logging/visual_logging.js';
1316

1417
import linearMemoryValueInterpreterStylesRaw from './linearMemoryValueInterpreter.css.js';
1518
import {Endianness, type ValueType, type ValueTypeMode} from './ValueInterpreterDisplayUtils.js';
1619
import type {TypeToggleEvent} from './ValueInterpreterSettings.js';
1720

21+
// TODO(crbug.com/391381439): Fully migrate off of constructed style sheets.
22+
const inspectorCommonStyles = new CSSStyleSheet();
23+
inspectorCommonStyles.replaceSync(inspectorCommonStylesRaw.cssText);
24+
1825
// TODO(crbug.com/391381439): Fully migrate off of constructed style sheets.
1926
const linearMemoryValueInterpreterStyles = new CSSStyleSheet();
2027
linearMemoryValueInterpreterStyles.replaceSync(linearMemoryValueInterpreterStylesRaw.cssText);
@@ -74,7 +81,7 @@ export class LinearMemoryValueInterpreter extends HTMLElement {
7481
#showSettings = false;
7582

7683
connectedCallback(): void {
77-
this.#shadow.adoptedStyleSheets = [linearMemoryValueInterpreterStyles];
84+
this.#shadow.adoptedStyleSheets = [inspectorCommonStyles, linearMemoryValueInterpreterStyles];
7885
}
7986

8087
set data(data: LinearMemoryValueInterpreterData) {
@@ -93,11 +100,14 @@ export class LinearMemoryValueInterpreter extends HTMLElement {
93100
<div class="value-interpreter">
94101
<div class="settings-toolbar">
95102
${this.#renderEndiannessSetting()}
96-
<button data-settings="true" class="settings-toolbar-button ${this.#showSettings ? 'active' : ''}"
103+
<devtools-button data-settings="true" class="toolbar-button ${this.#showSettings ? '' : 'disabled'}"
97104
title=${i18nString(UIStrings.toggleValueTypeSettings)} @click=${this.#onSettingsToggle}
98-
jslog=${VisualLogging.toggleSubpane('linear-memory-inspector.toggle-value-settings').track({click: true})}>
99-
<devtools-icon name=${this.#showSettings ? 'gear-filled' : 'gear'}></devtools-icon>
100-
</button>
105+
jslog=${VisualLogging.toggleSubpane('linear-memory-inspector.toggle-value-settings').track({click: true})}
106+
.iconName=${'gear'}
107+
.toggledIconName=${'gear-filled'}
108+
.toggleType=${Buttons.Button.ToggleType.PRIMARY}
109+
.variant=${Buttons.Button.Variant.ICON_TOGGLE}
110+
></devtools-button>
101111
</div>
102112
<span class="divider"></span>
103113
<div>
@@ -140,7 +150,7 @@ export class LinearMemoryValueInterpreter extends HTMLElement {
140150
<label data-endianness-setting="true" title=${i18nString(UIStrings.changeEndianness)}>
141151
<select
142152
jslog=${VisualLogging.dropDown('linear-memory-inspector.endianess').track({change: true})}
143-
style="border: none; background-color: transparent; cursor: pointer;"
153+
style="border: none;"
144154
data-endianness="true" @change=${onEnumSettingChange}>
145155
${[Endianness.LITTLE, Endianness.BIG].map(endianness => {
146156
return html`<option value=${endianness} .selected=${this.#endianness === endianness}

front_end/panels/linear_memory_inspector/components/ValueInterpreterDisplay.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ export class ValueInterpreterDisplay extends HTMLElement {
112112
}
113113

114114
connectedCallback(): void {
115-
this.#shadow.adoptedStyleSheets = [valueInterpreterDisplayStyles];
115+
this.#shadow.adoptedStyleSheets = [inspectorCommonStyles, valueInterpreterDisplayStyles];
116116
}
117117

118118
set data(data: ValueDisplayData) {
@@ -194,7 +194,6 @@ export class ValueInterpreterDisplay extends HTMLElement {
194194
<div>
195195
<select title=${i18nString(UIStrings.changeValueTypeMode)}
196196
data-mode-settings="true"
197-
style="border: none; background-color: transparent; cursor: pointer; color: var(--sys-color-token-subtle);"
198197
jslog=${VisualLogging.dropDown('linear-memory-inspector.value-type-mode').track({change: true})}
199198
@change=${this.#onValueTypeModeChange.bind(this, type)}>
200199
${VALUE_TYPE_MODE_LIST.filter(x => isValidMode(type, x)).map(mode => {

front_end/panels/linear_memory_inspector/components/linearMemoryValueInterpreter.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
display: flex;
2222
flex-wrap: nowrap;
2323
justify-content: space-between;
24-
padding-left: 12px;
25-
padding-right: 12px;
24+
padding-left: var(--sys-size-3);
25+
padding-right: var(--sys-size-3);
2626
align-items: center;
2727
}
2828

0 commit comments

Comments
 (0)