Skip to content

Commit df04758

Browse files
committed
fix: Screenshot Preview Mode setting wrong Prefs key
fix: Flipped hide extreme screenshot logic fix: Disabled gulps image breaking encoding
1 parent 7b8f8cb commit df04758

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

gulpfile.mjs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
/* eslint-disable no-undef */
2-
import fs from 'fs-extra';
3-
import gulp from 'gulp';
2+
import { createRsbuild, loadConfig } from '@rsbuild/core';
3+
import { execSync } from 'child_process';
44
import builder from 'electron-builder';
5+
import fs from 'fs-extra';
6+
import gulp, { parallel, series } from 'gulp';
7+
import path from 'path';
8+
import { pipeline } from 'stream';
59
import tar from 'tar-fs';
6-
import zlib from 'zlib';
7-
import { parallel, series } from 'gulp';
8-
import { installExtensions, buildExtensions, watchExtensions } from './gulpfile.extensions.js';
9-
import { execSync } from 'child_process';
1010
import { promisify } from 'util';
11-
import { createRsbuild, loadConfig } from '@rsbuild/core';
12-
import { pipeline } from 'stream';
13-
import path from 'path';
11+
import zlib from 'zlib';
12+
import { buildExtensions, installExtensions, watchExtensions } from './gulpfile.extensions.js';
1413

1514
// Promisify the pipeline function
1615
const pipelineAsync = promisify(pipeline);
@@ -312,7 +311,7 @@ async function buildRenderer() {
312311

313312
function buildStatic() {
314313
return gulp
315-
.src(config.static.src + '/**/*')
314+
.src(config.static.src + '/**/*', { encoding: false })
316315
.pipe(gulp.dest(config.static.dest));
317316
}
318317

@@ -510,4 +509,5 @@ export const nexusPack = series(
510509
buildExtensions,
511510
nexusPackTask
512511
);
513-
export const extInstall = series(installExtensions)
512+
export const extInstall = series(installExtensions)
513+
export const testStatic = series(buildStatic);

src/renderer/components/RightBrowseSidebar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -940,7 +940,7 @@ export function RightBrowseSidebar(props: RightBrowseSidebarProps) {
940940
</div>
941941
</div>
942942
) :
943-
(isExtreme && showExtremeScreenshot) ? (
943+
(isExtreme && !showExtremeScreenshot) ? (
944944
<div
945945
className='browse-right-sidebar__row__screenshot-image--hidden'
946946
onClick={() => setShowExtremeScreenshot(true)}>

src/renderer/components/pages/ConfigPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,7 @@ export function ConfigPage() {
778778
description={strings.screenshotPreviewModeDesc}
779779
value={preferences.screenshotPreviewMode}
780780
items={screenshotPreviewModes}
781-
onChange={onSetPreferenceEventFactory('defaultOpeningPage')}
781+
onChange={onSetPreferenceEventFactory('screenshotPreviewMode')}
782782
/>
783783
<ConfigBoxSelectInput
784784
title={strings.screenshotPreviewDelay}

src/renderer/store/history/slice.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { Location } from 'react-router-dom';
55
import { RootState } from '../store';
66

77
export type HistoryState = {
8-
history: Location[];
8+
history: Location<any>[];
99
maxHistorySize: number;
1010
}
1111

typings/flashpoint-launcher.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3140,7 +3140,7 @@ declare module 'flashpoint-launcher-renderer' {
31403140
}
31413141

31423142
type HistoryState = {
3143-
history: Location[];
3143+
history: Location<any>[];
31443144
maxHistorySize: number;
31453145
}
31463146

0 commit comments

Comments
 (0)