diff --git a/dist/better-xcloud.user.js b/dist/better-xcloud.user.js index b31e63f..2afd8e7 100644 --- a/dist/better-xcloud.user.js +++ b/dist/better-xcloud.user.js @@ -84,6 +84,42 @@ try { } catch (e) { } +// src/assets/svg/controller.svg +var controller_default = "\n \n\n"; + +// src/assets/svg/copy.svg +var copy_default = "\n \n\n"; + +// src/assets/svg/cursor-text.svg +var cursor_text_default = "\n \n\n"; + +// src/assets/svg/display.svg +var display_default = "\n \n\n"; + +// src/assets/svg/mouse-settings.svg +var mouse_settings_default = "\n \n\n"; + +// src/assets/svg/mouse.svg +var mouse_default = "\n \n\n"; + +// src/assets/svg/new.svg +var new_default = "\n \n\n"; + +// src/assets/svg/question.svg +var question_default = "\n \n\n"; + +// src/assets/svg/remote-play.svg +var remote_play_default = "\n \n\n"; + +// src/assets/svg/stream-settings.svg +var stream_settings_default = "\n \n\n"; + +// src/assets/svg/stream-stats.svg +var stream_stats_default = "\n \n\n"; + +// src/assets/svg/trash.svg +var trash_default = "\n \n\n"; + // src/utils/html.ts var createElement = function(elmName, props = {}, ..._) { let $elm; @@ -116,35 +152,24 @@ var createElement = function(elmName, props = {}, ..._) { return $elm; }; var CE = createElement; +var svgParser = (svg) => new DOMParser().parseFromString(svg, "image/svg+xml").documentElement; var Icon; (function(Icon2) { - Icon2["STREAM_SETTINGS"] = ''; - Icon2["STREAM_STATS"] = ''; - Icon2["CONTROLLER"] = ''; - Icon2["DISPLAY"] = ''; - Icon2["MOUSE"] = ''; - Icon2["MOUSE_SETTINGS"] = ''; - Icon2["NEW"] = ''; - Icon2["COPY"] = ''; - Icon2["TRASH"] = ''; - Icon2["CURSOR_TEXT"] = ''; - Icon2["QUESTION"] = ''; - Icon2["REMOTE_PLAY"] = ''; - Icon2["HAND_TAP"] = ''; + Icon2[Icon2["STREAM_SETTINGS"] = stream_settings_default] = "STREAM_SETTINGS"; + Icon2[Icon2["STREAM_STATS"] = stream_stats_default] = "STREAM_STATS"; + Icon2[Icon2["CONTROLLER"] = controller_default] = "CONTROLLER"; + Icon2[Icon2["DISPLAY"] = display_default] = "DISPLAY"; + Icon2[Icon2["MOUSE"] = mouse_default] = "MOUSE"; + Icon2[Icon2["MOUSE_SETTINGS"] = mouse_settings_default] = "MOUSE_SETTINGS"; + Icon2[Icon2["NEW"] = new_default] = "NEW"; + Icon2[Icon2["COPY"] = copy_default] = "COPY"; + Icon2[Icon2["TRASH"] = trash_default] = "TRASH"; + Icon2[Icon2["CURSOR_TEXT"] = cursor_text_default] = "CURSOR_TEXT"; + Icon2[Icon2["QUESTION"] = question_default] = "QUESTION"; + Icon2[Icon2["REMOTE_PLAY"] = remote_play_default] = "REMOTE_PLAY"; })(Icon || (Icon = {})); -var createSvgIcon = (icon, strokeWidth = 2) => { - const $svg = CE("svg", { - xmlns: "http://www.w3.org/2000/svg", - fill: "none", - stroke: "#fff", - "fill-rule": "evenodd", - "stroke-linecap": "round", - "stroke-linejoin": "round", - "stroke-width": strokeWidth - }); - $svg.innerHTML = icon; - $svg.setAttribute("viewBox", "0 0 32 32"); - return $svg; +var createSvgIcon = (icon) => { + return svgParser(icon.toString()); }; var ButtonStyle = {}; ButtonStyle[ButtonStyle.PRIMARY = 1] = "bx-primary"; @@ -168,7 +193,7 @@ var createButton = (options) => { style & index && $btn.classList.add(ButtonStyle[index]); }); options.classes && $btn.classList.add(...options.classes); - options.icon && $btn.appendChild(createSvgIcon(options.icon, 4)); + options.icon && $btn.appendChild(createSvgIcon(options.icon)); options.label && $btn.appendChild(CE("span", {}, options.label)); options.title && $btn.setAttribute("title", options.title); options.disabled && ($btn.disabled = true); @@ -5375,22 +5400,12 @@ var cloneStreamHudButton = function($orgButton, label, svgIcon) { } const $button = $container.querySelector("button"); $button.setAttribute("title", label); - const $svg = $button.querySelector("svg"); - $svg.innerHTML = svgIcon; + const $orgSvg = $button.querySelector("svg"); + const $svg = createSvgIcon(svgIcon); $svg.style.fill = "none"; - const attrs = { - fill: "none", - stroke: "#fff", - "fill-rule": "evenodd", - "stroke-linecap": "round", - "stroke-linejoin": "round", - "stroke-width": "2", - viewBox: "0 0 32 32" - }; - let attr; - for (attr in attrs) { - $svg.setAttribute(attr, attrs[attr]); - } + $svg.setAttribute("class", $orgSvg.getAttribute("class") || ""); + $svg.ariaHidden = "true"; + $orgSvg.replaceWith($svg); return $container; }; function injectStreamMenuButtons() { @@ -6051,17 +6066,17 @@ class MkbPreset { obj.mapping[keyName] = parseInt(buttonIndex); } } - const mouse = obj.mouse; - mouse[MkbPresetKey.MOUSE_SENSITIVITY_X] *= MkbHandler.DEFAULT_PANNING_SENSITIVITY; - mouse[MkbPresetKey.MOUSE_SENSITIVITY_Y] *= MkbHandler.DEFAULT_PANNING_SENSITIVITY; - mouse[MkbPresetKey.MOUSE_DEADZONE_COUNTERWEIGHT] *= MkbHandler.DEFAULT_DEADZONE_COUNTERWEIGHT; - mouse[MkbPresetKey.MOUSE_STICK_DECAY_STRENGTH] *= 0.01; - mouse[MkbPresetKey.MOUSE_STICK_DECAY_MIN] *= 0.01; - const mouseMapTo = MouseMapTo[mouse[MkbPresetKey.MOUSE_MAP_TO]]; + const mouse2 = obj.mouse; + mouse2[MkbPresetKey.MOUSE_SENSITIVITY_X] *= MkbHandler.DEFAULT_PANNING_SENSITIVITY; + mouse2[MkbPresetKey.MOUSE_SENSITIVITY_Y] *= MkbHandler.DEFAULT_PANNING_SENSITIVITY; + mouse2[MkbPresetKey.MOUSE_DEADZONE_COUNTERWEIGHT] *= MkbHandler.DEFAULT_DEADZONE_COUNTERWEIGHT; + mouse2[MkbPresetKey.MOUSE_STICK_DECAY_STRENGTH] *= 0.01; + mouse2[MkbPresetKey.MOUSE_STICK_DECAY_MIN] *= 0.01; + const mouseMapTo = MouseMapTo[mouse2[MkbPresetKey.MOUSE_MAP_TO]]; if (typeof mouseMapTo !== "undefined") { - mouse[MkbPresetKey.MOUSE_MAP_TO] = mouseMapTo; + mouse2[MkbPresetKey.MOUSE_MAP_TO] = mouseMapTo; } else { - mouse[MkbPresetKey.MOUSE_MAP_TO] = MkbPreset.MOUSE_SETTINGS[MkbPresetKey.MOUSE_MAP_TO].default; + mouse2[MkbPresetKey.MOUSE_MAP_TO] = MkbPreset.MOUSE_SETTINGS[MkbPresetKey.MOUSE_MAP_TO].default; } console.log(obj); return obj; @@ -7087,18 +7102,7 @@ var setupQuickSettingsBar = function() { if (!settingTab) { continue; } - const $svg = CE("svg", { - xmlns: "http://www.w3.org/2000/svg", - "data-group": settingTab.group, - fill: "none", - stroke: "#fff", - "fill-rule": "evenodd", - "stroke-linecap": "round", - "stroke-linejoin": "round", - "stroke-width": 2 - }); - $svg.innerHTML = settingTab.icon; - $svg.setAttribute("viewBox", "0 0 32 32"); + const $svg = createSvgIcon(settingTab.icon); $svg.addEventListener("click", (e) => { for (const $child of Array.from($settings.children)) { if ($child.getAttribute("data-group") === settingTab.group) { @@ -7536,7 +7540,7 @@ var updateIceCandidates = function(candidates, options) { }; lst.forEach((item2) => { item2.foundation = foundation; - item2.priority = foundation == 1 ? 1e4 : 1; + item2.priority = foundation == 1 ? 2130706431 : 1; newCandidates.push(newCandidate(`a=candidate:${item2.foundation} 1 UDP ${item2.priority} ${item2.ip} ${item2.port} ${item2.the_rest}`)); ++foundation; });