diff --git a/core/chat/macos/desktop.css b/core/chat/macos/desktop.css index 3af35675..0f89e4a0 100644 --- a/core/chat/macos/desktop.css +++ b/core/chat/macos/desktop.css @@ -26,8 +26,9 @@ fieldset.macos.desktop>div.output>fieldset.macos.notifications>div.output>div.it fieldset.macos.desktop>div.output>fieldset.macos.notifications>div.output>div.item div.title { font-family:var(--legend-font-family); flex-grow:1; word-break: break-all; } fieldset.macos.desktop>div.output>fieldset.macos.notifications>div.output>div.item div.time { color:var(--disable-fg-color); font-size:var(--status-font-size); padding:var(--input-padding); } fieldset.macos.desktop>div.output>fieldset.macos.notifications>div.output>div.item div.content { font-size:var(--status-font-size); } +fieldset.macos.desktop>div.output>div.desktop { display:flex; flex-direction:column; flex-wrap:wrap; align-content:start; gap:10px; height:calc(100% - 125px); overflow:auto; } fieldset.macos.desktop>div.output>div.desktop:not(.select) { display:none; } -fieldset.macos.desktop>div.output>div.desktop>div.item { position:absolute; text-align:center; } +fieldset.macos.desktop>div.output>div.desktop>div.item { text-align:center; width:var(--desktop-icon-size); } fieldset.macos.desktop>div.output>div.desktop>div.item img { object-fit:contain; height:var(--desktop-icon-size); width:var(--desktop-icon-size); } fieldset.macos.desktop>div.output>div.desktop>div.item>div.name { font-size:var(--code-font-size); width:var(--desktop-icon-size); overflow:hidden; } fieldset.macos.desktop>div.output>div.desktop>fieldset { border-radius:var(--plugin-radius); position:absolute; } @@ -38,7 +39,6 @@ fieldset.macos.desktop>div.output>div.desktop>fieldset>legend { padding:0 var(-- fieldset.macos.desktop>div.output>div.desktop>fieldset>legend:not(:hover) { background-color:transparent; } fieldset.macos.desktop>div.output>div.desktop>fieldset>form.option>*:not(.textarea) { margin:var(--button-margin); } fieldset.macos.desktop>div.output>div.desktop>fieldset>form.option>div.icon { margin:var(--button-margin) 0; } -fieldset.macos.desktop>div.output>div.desktop>fieldset:not(:hover)>form.option>div.icon { visibility:hidden; } fieldset.macos.desktop>div.output>div.desktop>fieldset>form.option>div.item:last-child { margin-right:100px; } fieldset.macos.desktop>div.output>div.desktop>fieldset>div.action>div.item:last-child { margin-right:100px; } fieldset.macos.desktop>div.output>div.desktop>fieldset>div.action>* { margin:var(--button-margin); } @@ -79,4 +79,6 @@ body:not(.mobile) fieldset.macos.dock>div.output { overflow:visible; } body:not(.mobile) fieldset.macos.dock>div.output>div.item:hover { background-color:unset; margin-top:-80px; transition:margin-top 0.3s; } body:not(.mobile) fieldset.macos.dock>div.output>div.item img:hover { width:160px; transition:width 0.3s; } body:not(.mobile) fieldset.macos.desktop>div.output>fieldset.macos.dock:hover { margin-left:-40px; transition:margin-left 0.3s; } +body:not(.mobile) fieldset.macos.desktop>div.output>div.desktop>fieldset:not(:hover)>form.option>div.icon { visibility:hidden; } body.mobile fieldset.macos.desktop>div.output>div.desktop>fieldset>form.option>div.item.text>input { width:60px; } +body.mobile fieldset.macos.dock>div.output { overflow-y:hidden; } diff --git a/core/chat/macos/desktop.js b/core/chat/macos/desktop.js index 7cc86202..22ea63d7 100644 --- a/core/chat/macos/desktop.js +++ b/core/chat/macos/desktop.js @@ -59,7 +59,7 @@ Volcanos(chat.ONIMPORT, { can.page.SelectChild(can, can.ui.desktop, html.DIV_ITEM, function(target) { can.page.Remove(can, target) }), can.onimport.__item(can, msg, can.ui.desktop) }) }) }, __item: function(can, msg, target) { var index = 0; can.onimport.icon(can, msg = msg||can._msg, target, function(target, item) { can.page.Modify(can, target, { - onclick: function(event) { can.onimport._window(can, item) }, style: can.onexport.position(can, index++), + onclick: function(event) { can.onimport._window(can, item) }, oncontextmenu: function(event) { var carte = can.user.carteRight(event, can, { remove: function() { can.runAction(event, mdb.REMOVE, [item.hash]) }, }); can.page.style(can, carte._target, html.TOP, event.y) }, @@ -138,10 +138,6 @@ Volcanos(chat.ONDETAIL, { select: function(can, target) { can.onmotion.select(can, can.ui.desktop, html.FIELDSET, target) }, }) Volcanos(chat.ONEXPORT, { - position: function(can, index) { var top = 25, margin = 20, height = 100, width = 80 - var n = parseInt((can.ConfHeight()-top)/(height+margin)) - return {top: index%n*height+top+margin/2, left: parseInt(index/n)*(width+margin)+margin/2} - }, tabs: function(can) { var list = can.page.Select(can, can.ui.menu._output, html.DIV_TABS, function(target) { return { select: can.page.ClassList.has(can, target, html.SELECT),