mirror of
https://github.com/HeyPuter/puter.git
synced 2026-05-25 10:20:20 -05:00
I swear taskbar is fixed now
This commit is contained in:
+7
-9
@@ -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,
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user