Skip to content

Fix horizontal scroll width and theme settings #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yuhaofe merged 2 commits into from
Oct 18, 2025
Merged

Fix horizontal scroll width and theme settings #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0276a19
Fix horizontal scroll width
yuhaofe Oct 18, 2025
2f4e002
Fix settings
yuhaofe Oct 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions src/Popup.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,6 @@ body {
background-color: var(--bg-color);
margin: 0px 0px;
padding: 0px;
display: flex;
flex-direction: column;
min-width: 300px;
max-width: 800px;
max-height: 600px;
Expand All @@ -86,16 +84,7 @@ body.startup {
height: var(--startup-height)!important;
}

body > :first-child {
flex: 0 0 auto;
}

body > :nth-child(2) {
flex: 1 1 auto;
}

body > :nth-child(3), body > :nth-child(3):hover, body > :nth-child(3):focus, body > :nth-child(3):active {
flex: 0 0 auto;
box-sizing: content-box;
border-top-width: 1px!important;
border-top-color: var(--line-color);
Expand Down
50 changes: 2 additions & 48 deletions src/Popup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ import PopupHeader from './components/PopupHeader';
import PopupContainer from './components/PopupContainer';
import PopupFooter from './components/PopupFooter';
import ContextMenu from './components/ContextMenu';
import { applyTheme } from './utils/theme';
import './Popup.scss';


interface PopupProps {
config: Configuration
}
Expand Down Expand Up @@ -62,52 +64,4 @@ function adjustHeight(length: number) {
const rootStyle = document.documentElement.style;
const height = (length + 2) * 30;
rootStyle.setProperty('--startup-height', (height > 600) ? '600px' : height + 'px');
}

function applyTheme(theme: 'auto' | 'light' | 'dark') {
const rootElm = document.documentElement;

const applyDarkTheme = () => {
rootElm.classList.add('theme-dark');
rootElm.classList.remove('theme-light');
chrome.action.setIcon({
path: {
"16": "/icons/qbm16-dark.png",
"32": "/icons/qbm32-dark.png"
}
});
}

const applyLightTheme = () => {
rootElm.classList.add('theme-light');
rootElm.classList.remove('theme-dark');
chrome.action.setIcon({
path: {
"16": "/icons/qbm16.png",
"32": "/icons/qbm32.png"
}
});
}

switch (theme) {
case 'light':
applyLightTheme();
break;
case 'dark':
applyDarkTheme();
break;
case 'auto':
default:
const mql = window.matchMedia('(prefers-color-scheme: dark)');
const colorSchemeTest = (e: MediaQueryListEvent | MediaQueryList) => {
if (e.matches) {
applyDarkTheme();
} else {
applyLightTheme();
}
};
mql.onchange = colorSchemeTest;
colorSchemeTest(mql);
break;
}
}
15 changes: 7 additions & 8 deletions src/components/PopupContainer/OptionsItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,21 @@ export interface OptionsItem {
type: 'radio' | 'checkbox';
/** This item's options */
options: Option[];
/** callback after value change */
callback?: (val: any) => void;
}

interface OptionsItemProps extends OptionsItem { }

export default function OptionsItem({ name: itemName, storage, type, options }: OptionsItemProps) {
export default function OptionsItem({ name: itemName, storage, type, options, callback }: OptionsItemProps) {
const [value, setValue] = useState(options[0].value);
const name = itemName.replace('_', '-');

const saveValue = async (val: any) => {
chrome.storage.local.set({ [storage]: val })
.then(() => {
setValue(val);
});

if (itemName === 'root_folder') {
chrome.storage.local.set({ startup: [val, 18] });
await chrome.storage.local.set({ [storage]: val });
setValue(val);
if (callback && typeof callback === 'function') {
callback(val);
}
};

Expand Down
11 changes: 9 additions & 2 deletions src/components/PopupContainer/OptionsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { h } from 'preact';
import { useEffect, useState } from 'preact/hooks';
import OptionsItemComponent, { OptionsItem } from './OptionsItem';
import { applyTheme } from '../../utils/theme';
import "./OptionsPage.scss";

const optionsItems: OptionsItem[] = [
Expand Down Expand Up @@ -92,7 +93,10 @@ const optionsItems: OptionsItem[] = [
name: 'root_folder',
storage: 'root',
type: 'radio',
options: [{ name: '', value: '0' }]
options: [{ name: '', value: '0' }],
callback: (val) => {
chrome.storage.local.set({ startup: [val, 18] });
}
},
{
name: 'color_theme',
Expand All @@ -111,7 +115,10 @@ const optionsItems: OptionsItem[] = [
name: 'dark',
value: 'dark',
}
]
],
callback: (val) => {
applyTheme(val);
}
},
{
name: 'scroll_layout',
Expand Down
1 change: 1 addition & 0 deletions src/components/PopupContainer/PopupContainer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
position: relative;
max-width: 800px;
min-width: 300px;
max-height: 538px;

&-horiz {
overflow-x: auto;
Expand Down
51 changes: 51 additions & 0 deletions src/utils/theme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
let mql: MediaQueryList | null = null;

export function applyTheme(theme: 'auto' | 'light' | 'dark') {
const rootElm = document.documentElement;

const applyDarkTheme = () => {
rootElm.classList.add('theme-dark');
rootElm.classList.remove('theme-light');
chrome.action.setIcon({
path: {
"16": "/icons/qbm16-dark.png",
"32": "/icons/qbm32-dark.png"
}
});
}

const applyLightTheme = () => {
rootElm.classList.add('theme-light');
rootElm.classList.remove('theme-dark');
chrome.action.setIcon({
path: {
"16": "/icons/qbm16.png",
"32": "/icons/qbm32.png"
}
});
}

switch (theme) {
case 'light':
applyLightTheme();
break;
case 'dark':
applyDarkTheme();
break;
case 'auto':
default:
const colorSchemeTest = (e: MediaQueryListEvent | MediaQueryList) => {
if (e.matches) {
applyDarkTheme();
} else {
applyLightTheme();
}
};
if(!mql) {
mql = window.matchMedia('(prefers-color-scheme: dark)');
mql.addEventListener("change", colorSchemeTest);
}
colorSchemeTest(mql);
break;
}
}