Skip to content

Commit 00642ee

Browse files
author
Alberto Iannaccone
committed
fix dialogs sizes
1 parent bc554b6 commit 00642ee

File tree

4 files changed

+36
-12
lines changed

4 files changed

+36
-12
lines changed

Diff for: arduino-ide-extension/src/browser/dialogs/settings/settings-component.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ export class SettingsComponent extends React.Component<
119119
'Show files inside Sketches'
120120
)}
121121
</label>
122-
<div className="flex-line">
122+
<div className="column-container">
123123
<div className="column">
124124
<div className="flex-line">
125125
{nls.localize(

Diff for: arduino-ide-extension/src/browser/dialogs/settings/settings-dialog.tsx

+12-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
import * as React from '@theia/core/shared/react';
2-
import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
2+
import {
3+
injectable,
4+
inject,
5+
postConstruct,
6+
} from '@theia/core/shared/inversify';
37
import { Widget } from '@theia/core/shared/@phosphor/widgets';
48
import { Message } from '@theia/core/shared/@phosphor/messaging';
5-
import { DialogError, ReactWidget } from '@theia/core/lib/browser';
6-
import { AbstractDialog, DialogProps } from '@theia/core/lib/browser';
9+
import { DialogError, DialogProps, ReactWidget } from '@theia/core/lib/browser';
710
import { Settings, SettingsService } from './settings';
811
import { FileService } from '@theia/filesystem/lib/browser/file-service';
912
import { WindowService } from '@theia/core/lib/browser/window/window-service';
@@ -12,6 +15,7 @@ import { nls } from '@theia/core/lib/common';
1215
import { SettingsComponent } from './settings-component';
1316
import { AsyncLocalizationProvider } from '@theia/core/lib/common/i18n/localization';
1417
import { AdditionalUrls } from '../../../common/protocol';
18+
import { AbstractDialog } from '../../theia/dialogs/dialogs';
1519

1620
@injectable()
1721
export class SettingsWidget extends ReactWidget {
@@ -58,7 +62,8 @@ export class SettingsDialog extends AbstractDialog<Promise<Settings>> {
5862
@inject(SettingsDialogProps)
5963
protected override readonly props: SettingsDialogProps
6064
) {
61-
super(props);
65+
super({ ...props, maxWidth: 740 });
66+
this.node.classList.add('arduino-settings-dialog-container');
6267
this.contentNode.classList.add('arduino-settings-dialog');
6368
this.appendCloseButton(
6469
nls.localize('vscode/issueMainService/cancel', 'Cancel')
@@ -73,7 +78,9 @@ export class SettingsDialog extends AbstractDialog<Promise<Settings>> {
7378
);
7479
}
7580

76-
protected override async isValid(settings: Promise<Settings>): Promise<DialogError> {
81+
protected override async isValid(
82+
settings: Promise<Settings>
83+
): Promise<DialogError> {
7784
const result = await this.settingsService.validate(settings);
7885
if (typeof result === 'string') {
7986
return result;

Diff for: arduino-ide-extension/src/browser/style/dialogs.css

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
.p-Widget.dialogOverlay .dialogBlock {
22
border-radius: 3px;
3-
padding: 0 28px;
43
box-shadow: 0px 4px 20px rgba(0, 0, 0, 0.25);
5-
min-height: 0px;
4+
margin: 15px 20px;
5+
6+
/*
7+
padding (left + right) = 56px
8+
margin (left + right) = 40px
9+
total = padding + margin = 96px
10+
*/
11+
max-width: calc(100% - 96px) !important;
12+
padding: 0 28px;
613
}
714

815
.p-Widget.dialogOverlay .dialogBlock .dialogTitle {

Diff for: arduino-ide-extension/src/browser/style/settings-dialog.css

+14-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
.arduino-settings-dialog {
2-
width: 740px;
1+
.arduino-settings-dialog-container > .dialogBlock {
2+
width: calc(100% - 96px);
33
}
44

55
.arduino-settings-dialog .content {
66
padding: 5px;
7-
height: 300px;
87
}
98

109
.arduino-settings-dialog .flex-line {
@@ -26,8 +25,13 @@
2625
vertical-align: middle;
2726
}
2827

28+
.arduino-settings-dialog .column-container {
29+
display: flex;
30+
gap: 20px;
31+
}
32+
2933
.arduino-settings-dialog .stretch {
30-
width: 100% !important;
34+
flex: 1;
3135
}
3236

3337
.arduino-settings-dialog .flex-line .theia-button.shrink {
@@ -50,14 +54,20 @@
5054
.additional-urls-dialog .link:hover {
5155
color: var(--theia-textLink-activeForeground);
5256
}
57+
5358
.arduino-settings-dialog .react-tabs__tab-panel {
5459
padding-bottom: 25px;
5560
}
61+
5662
.arduino-settings-dialog .react-tabs__tab-list {
5763
display: flex;
5864
justify-content: center;
5965
}
6066

67+
.additional-urls-dialog textarea {
68+
width: 100%;
69+
}
70+
6171
.p-Widget.dialogOverlay .dialogBlock .dialogContent.additional-urls-dialog {
6272
display: block;
6373
}

0 commit comments

Comments
 (0)