random trivial fixes (#460)

This commit is contained in:
end-4
2024-05-04 19:37:57 +07:00
committed by GitHub
2 changed files with 7 additions and 8 deletions
@@ -204,16 +204,15 @@ export const NetworkIndicator = () => Widget.Stack({
const HyprlandXkbKeyboardLayout = async ({ useFlag } = {}) => { const HyprlandXkbKeyboardLayout = async ({ useFlag } = {}) => {
try { try {
const Hyprland = (await import('resource:///com/github/Aylur/ags/service/hyprland.js')).default; const Hyprland = (await import('resource:///com/github/Aylur/ags/service/hyprland.js')).default;
var initLangs = [];
var languageStackArray = []; var languageStackArray = [];
var currentKeyboard;
const updateCurrentKeyboards = () => { const updateCurrentKeyboards = () => {
currentKeyboard = JSON.parse(Utils.exec('hyprctl -j devices')).keyboards var initLangs = [];
.find(device => device.name === 'at-translated-set-2-keyboard'); JSON.parse(Utils.exec('hyprctl -j devices')).keyboards
if (currentKeyboard) { .forEach(keyboard => {
initLangs = currentKeyboard.layout.split(',').map(lang => lang.trim()); initLangs.push(...keyboard.layout.split(',').map(lang => lang.trim()));
} });
initLangs = [...new Set(initLangs)];
languageStackArray = Array.from({ length: initLangs.length }, (_, i) => { languageStackArray = Array.from({ length: initLangs.length }, (_, i) => {
const lang = languages.find(lang => lang.layout == initLangs[i]); const lang = languages.find(lang => lang.layout == initLangs[i]);
// if (!lang) return [ // if (!lang) return [
@@ -180,7 +180,7 @@ const CoverArt = ({ player, ...rest }) => {
// const player = Mpris.getPlayer(); // Maybe no need to re-get player.. can't remember why I had this // const player = Mpris.getPlayer(); // Maybe no need to re-get player.. can't remember why I had this
// Player closed // Player closed
// Note that cover path still remains, so we're checking title // Note that cover path still remains, so we're checking title
if (!player || player.trackTitle == "") { if (!player || player.trackTitle == "" || !player.coverPath) {
self.css = `background-image: none;`; // CSS image self.css = `background-image: none;`; // CSS image
App.applyCss(`${COMPILED_STYLE_DIR}/style.css`); App.applyCss(`${COMPILED_STYLE_DIR}/style.css`);
return; return;