From 9b7c4205fe638aa49fdf1b53a5db25c9d922e9fe Mon Sep 17 00:00:00 2001 From: jelveh Date: Thu, 30 Oct 2025 13:02:32 -0700 Subject: [PATCH] I swear taskbar is fixed now --- src/gui/src/IPC.js | 16 +++++++--------- src/gui/src/UI/UITaskbar.js | 6 +++--- src/gui/src/UI/UIWindow.js | 4 ++-- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/gui/src/IPC.js b/src/gui/src/IPC.js index 8f9a32300..742525497 100644 --- a/src/gui/src/IPC.js +++ b/src/gui/src/IPC.js @@ -1179,19 +1179,17 @@ const ipc_listener = async (event, handled) => { if(event.data.options === undefined || typeof event.data.options !== 'object') event.data.options = {}; - // clear window_options for security reasons - event.data.options.window_options = {} - - // Set app as parent window of font picker window - event.data.options.window_options.parent_uuid = event.data.appInstanceID; - - // disable parent window - event.data.options.window_options.disable_parent_window = true; + // options.permission must be provided and be a string + if(!event.data.options.permission || typeof event.data.options.permission !== 'string') + return; let granted = await UIWindowRequestPermission( { permission: event.data.options.permission, - window_options: event.data.options.window_options, + window_options: { + parent_uuid: event.data.appInstanceID, + disable_parent_window: true, + }, app_uid: app_uuid, app_name: app_name, } diff --git a/src/gui/src/UI/UITaskbar.js b/src/gui/src/UI/UITaskbar.js index e1beba183..a96c3d53c 100644 --- a/src/gui/src/UI/UITaskbar.js +++ b/src/gui/src/UI/UITaskbar.js @@ -508,12 +508,12 @@ window.update_taskbar_position = async function(new_position) { // adjust position if sidepanel is open if(window.taskbar_position === 'bottom'){ if($('.window[data-is_panel="1"][data-is_visible="1"]').length > 0){ - $('.taskbar.taskbar-position-bottom').css('transform', `translateX(-${window.PANEL_WIDTH}px)`); + $('.taskbar.taskbar-position-bottom').css('left', `calc(50% - ${window.PANEL_WIDTH/2}px)`); } else if($('.window[data-is_panel="1"][data-is_visible="0"]').length > 0){ - $('.taskbar.taskbar-position-bottom').css('transform', `translateX(-${window.PANEL_WIDTH/2}px)`); + $('.taskbar.taskbar-position-bottom').css('left', `calc(50%)`); } }else{ - $('.taskbar').css('transform', `translateX(0px)`); + } // Reinitialize all taskbar item tooltips with new position diff --git a/src/gui/src/UI/UIWindow.js b/src/gui/src/UI/UIWindow.js index cfa0de4b6..c19426569 100644 --- a/src/gui/src/UI/UIWindow.js +++ b/src/gui/src/UI/UIWindow.js @@ -3611,7 +3611,7 @@ $.fn.makeWindowVisible = function(options){ // if sidepanel, shift desktop toolbar to the left if($(this).attr('data-is_panel') === '1'){ $('.toolbar').css('left', `calc(50% - ${window.PANEL_WIDTH/2}px)`); - $('.taskbar.taskbar-position-bottom').css('transform', `translateX(-${window.PANEL_WIDTH}px)`); + $('.taskbar.taskbar-position-bottom').css('left', `calc(50% - ${window.PANEL_WIDTH/2}px)`); $('.window[data-is_panel="0"]').css('transform', `translateX(-${window.PANEL_WIDTH/2}px)`); } } @@ -3628,7 +3628,7 @@ $.fn.makeWindowInvisible = async function(options) { // if sidepanel, shift desktop toolbar to the right if($(this).attr('data-is_panel') === '1'){ $('.toolbar').css('left', `calc(50%)`); - $('.taskbar.taskbar-position-bottom').css('transform', `translateX(-50%)`); + $('.taskbar.taskbar-position-bottom').css('left', `calc(50%)`); $('.window[data-is_panel="0"]').css('transform', `translateX(0px)`); // update taskbar position }