Skip to content

Commit 62e786f

Browse files
committed
Do not activate toolbar when desktop selectable is active
1 parent 7285a27 commit 62e786f

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

src/gui/src/UI/UIDesktop.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1102,6 +1102,8 @@ async function UIDesktop(options) {
11021102
}
11031103
})
11041104
.on('move', ({ store: { changed: { added, removed } }, event }) => {
1105+
window.desktop_selectable_is_active = true;
1106+
11051107
for (const el of added) {
11061108
// if ctrl or meta key is pressed and the item is already selected, then unselect it
11071109
if ((event.ctrlKey || event.metaKey) && $(el).hasClass('item-selected')) {
@@ -1122,6 +1124,7 @@ async function UIDesktop(options) {
11221124
}
11231125
})
11241126
.on('stop', evt => {
1127+
window.desktop_selectable_is_active = false;
11251128
});
11261129
}
11271130
// ----------------------------------------------------
@@ -1524,7 +1527,7 @@ async function UIDesktop(options) {
15241527

15251528
$('.toolbar').animate({
15261529
top: 0,
1527-
}, 100).css('width', 'fit-content');
1530+
}, 100).css('width', 'max-content');
15281531

15291532
// animate show toolbar-btn, toolbar-clock
15301533
$('.toolbar-btn, #clock, .user-options-menu-btn').animate({
@@ -1628,6 +1631,10 @@ async function UIDesktop(options) {
16281631
if(window.a_window_is_being_dragged)
16291632
return;
16301633

1634+
// if selectable is active , don't show the toolbar
1635+
if(window.desktop_selectable_is_active)
1636+
return;
1637+
16311638
if(window.is_fullpage_mode)
16321639
$('.window-app-iframe').css('pointer-events', 'none');
16331640

src/gui/src/css/style.css

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,7 @@ input[type=text]:focus, input[type=password]:focus, input[type=email]:focus, sel
346346
grid-template-rows: repeat(auto-fill, 109px);
347347
grid-auto-flow: column;
348348
grid-template-columns: repeat(auto-fill, 120px);
349+
padding-top: 15px;
349350
}
350351

351352
.fullpage-mode .window-minimize-btn {
@@ -1771,9 +1772,10 @@ label {
17711772
border-top-left-radius: 0px;
17721773
border-bottom-left-radius: 10px;
17731774
border-bottom-right-radius: 10px;
1774-
width: fit-content;
1775+
width: max-content;
17751776
overflow: clip;
17761777
box-shadow: rgb(255 255 255 / 14%) 0px 0px 0px 0.5px inset, rgba(0, 0, 0, 0.2) 0px 0px 0px 0.5px, rgba(0, 0, 0, 0.2) 0px 2px 14px;
1778+
position: absolute;
17771779

17781780
}
17791781

0 commit comments

Comments
 (0)