Skip to content

Commit 6493368

Browse files
committed
2600 based changes to SpriteEditor
Fixed issue with SE configuration file loading for wrong location
1 parent 241cf6f commit 6493368

5 files changed

Lines changed: 39 additions & 16 deletions

File tree

out/content/pages/spriteeditor/main.css

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2424,16 +2424,16 @@ Spritemate stylesheet
24242424
{
24252425
font-size: 160%;
24262426
color: var(--blue);
2427-
text-align:center;
2428-
margin-bottom: 0px;
2427+
text-align:left;
2428+
margin: 0px 0px 0px 8px;
24292429
}
24302430

24312431
h2
24322432
{
24332433
font-size: 110%;
24342434
color: var(--blue);
2435-
text-align: center;
2436-
margin: 0px 0px 12px 0px;
2435+
text-align: left;
2436+
margin: 0px 0px 12px 8px;
24372437
}
24382438

24392439
ol
@@ -2481,6 +2481,7 @@ Spritemate stylesheet
24812481
table
24822482
{
24832483
width: 100%;
2484+
padding-bottom: 16px;
24842485
}
24852486

24862487
td,th
@@ -2659,7 +2660,8 @@ Spritemate stylesheet
26592660
}
26602661

26612662
.ui-checkboxradio {
2662-
margin-right: 8px;
2663+
margin-left: 0px;
2664+
margin-right: 8px;
26632665
}
26642666

26652667
#info

out/content/pages/spriteeditor/main.js

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

out/pages/spriteeditor.js

Lines changed: 11 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

out/pages/spriteeditor.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/pages/spriteeditor.ts

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ export class SpriteEditorPage implements vscode.Disposable {
6363
//let basePathUri = basePath.with({ scheme: 'vscode-resource' }).toString() + '/';
6464

6565
// Configuration
66-
let configuration = await this.loadConfiguration(startPagePath);
66+
let configuration = await this.loadConfiguration(contentUri);
6767

6868
// Update tags in content
6969
content = this.replaceContentTag(content, "APPNAME", "Sprite Editor");
@@ -146,7 +146,11 @@ export class SpriteEditorPage implements vscode.Disposable {
146146
await application.Delay(delay).then(_ =>
147147
this.loadFileContent("loadProject", loadProjectUri)
148148
)
149+
} else {
150+
// normal opening - show project if chosen by user
151+
this.attemptToOpenProjectWindowOnStartup();
149152
}
153+
150154
}
151155

152156
private getNonce() {
@@ -629,4 +633,11 @@ export class SpriteEditorPage implements vscode.Disposable {
629633
});
630634
});
631635
}
636+
637+
private attemptToOpenProjectWindowOnStartup() {
638+
this.currentPanel!.webview.postMessage({
639+
command: "attemptToOpenProjectWindowOnStartup",
640+
status: 'ok'
641+
});
642+
}
632643
}

0 commit comments

Comments
 (0)