From 8e3f3f8f15409ffe5181078d93f1e1ced833aabe Mon Sep 17 00:00:00 2001 From: shylinux Date: Tue, 2 May 2023 21:51:44 +0800 Subject: [PATCH] opt some --- src/macos/desktop.css | 8 +++-- src/macos/desktop.js | 75 +++++++++++++++++++++---------------------- src/macos/finder.js | 2 +- 3 files changed, 44 insertions(+), 41 deletions(-) diff --git a/src/macos/desktop.css b/src/macos/desktop.css index 23f26f09..5fd8d9fa 100644 --- a/src/macos/desktop.css +++ b/src/macos/desktop.css @@ -8,10 +8,12 @@ fieldset.macos.desktop>div.output>div.desktop:not(.select) { display:none; } fieldset.macos.desktop>div.output>div.desktop>fieldset { border-radius:10px; position:absolute; } fieldset.macos.desktop>div.output>div.desktop>fieldset>div.item.button { border-radius:20px; height:20px; width:20px; scale:0.7; position:absolute; top:15px; right:10px; } fieldset.macos.desktop>div.output>div.desktop>fieldset>legend { background-color:unset; padding-right:10px; margin:10px 0; } -fieldset.macos.desktop>div.output>div.desktop>fieldset>form.option>* { margin:10px 0; } +fieldset.macos.desktop>div.output>div.desktop>fieldset>form.option>* { margin:10px 0px 10px 10px; } +fieldset.macos.desktop>div.output>div.desktop>fieldset>form.option>div.item:last-child { margin-right:80px; } fieldset.macos.desktop>div.output>div.desktop>fieldset>form.option>div.icon { margin-top:12px; margin-bottom:8px; } fieldset.macos.desktop>div.output>div.desktop>fieldset>form.option>div.item.icons>span.icon { margin-left:5px; } -fieldset.macos.desktop>div.output>div.desktop>fieldset>div.action>* { margin:10px 0; } +fieldset.macos.desktop>div.output>div.desktop>fieldset>div.action>* { margin:10px 0px 10px 10px; } +fieldset.macos.desktop>div.output>div.desktop>fieldset>div.action>div.item:last-child { margin-right:80px; } fieldset.macos.menu>div.output img { margin-bottom:-8px; } fieldset.macos.menu>div.output>div.item { padding:0 5px; float:right; cursor:pointer; } fieldset.macos.menu>div.output>div.item img { height:25px; } @@ -60,6 +62,8 @@ body.dark fieldset.macos.desktop>div.output>div.desktop fieldset>div.output.card body.light fieldset.macos.desktop>div.output { background-color:unset; } body.black fieldset.macos.desktop>div.output>div.desktop fieldset { background-color:#3433337a; } body.black fieldset.macos.desktop>div.output>div.desktop>fieldset>div.output { background-color:#1a1d1d9c; } +body.black fieldset.macos.desktop>div.output>div.desktop fieldset table.content tr:nth-child(odd) { background-color:#1a1d1ee0; color:white; } +body.black fieldset.macos.desktop>div.output>div.desktop fieldset table.content tr:nth-child(even) { background-color:#282b2fc7; color:white; } body.white fieldset.macos.desktop>div.output>div.desktop fieldset { background-color:#f5f5f594; } body.white fieldset.macos.desktop>div.output>div.desktop fieldset>legend { color:black; } body.white fieldset.macos.desktop>div.output>div.desktop>fieldset>div.output { background-color:#ffffff94; } diff --git a/src/macos/desktop.js b/src/macos/desktop.js index fcf3d971..7c223661 100644 --- a/src/macos/desktop.js +++ b/src/macos/desktop.js @@ -7,44 +7,8 @@ Volcanos(chat.ONIMPORT, { sub.onexport.record = function(_, value, key, item) { switch (value) { case "system": - var carte = can.user.carte(event, can, { - "desktop\t>": function(event) { - can.user.carteRight(event, can, {}, [{view: [html.ITEM, "", "create"], onclick: function(event) { - can.onaction.create(event, can) - }}].concat(can.page.Select(can, can._action, "div.tabs>span.name", function(target) { - return {view: [html.ITEM, "", target.innerText+(can.page.ClassList.has(can, target.parentNode, html.SELECT)? " *": "")], - onclick: function(event) { target.click() }, - oncontextmenu: function(event) { can.user.carteRight(event, can, { - remove: function() { target.parentNode._close() }, - }, [], function() {}, carte) }, - } - })), function(event) {}, carte) - }, - "window\t>": function(event) { - can.user.carteRight(event, can, {}, can.page.Select(can, can.ui.desktop, "fieldset>legend", function(legend) { - return {view: [html.ITEM, "", legend.innerText+(legend.parentNode.style["z-index"] == "10"? " *": "")], onclick: function(event) { - can.ondetail.select(can, legend.parentNode) - }} - }), function(event) {}, carte) - }, - "layout\t>": function(event) { - can.user.carteRight(event, can, { - grid: function(event) { var list = can.page.SelectChild(can, can.ui.desktop, "fieldset") - for (var i = 0; i*i < list.length; i++) {} for (var j = 0; j*i < list.length; j++) {} - var height = (can.ConfHeight()-25)/j, width = can.ConfWidth()/i - can.core.List(list, function(target, index) { - can.page.style(can, target, html.TOP, parseInt(index/i)*height+25, html.LEFT, index%i*width) - target._can.onimport.size(target._can, height, width) - }) - }, - free: function(event) { var list = can.page.SelectChild(can, can.ui.desktop, "fieldset") - can.core.List(list, function(target, index) { - can.page.style(can, target, html.TOP, can.ConfHeight()/2/list.length*index+25, html.LEFT, can.ConfWidth()/2/list.length*index) - }) - }, - }, [], function(event) {}, carte) - }, - full: function(event) { can.onaction.full(event, can) }, + var carte = can.user.carte(event, can, {}, can.core.Item(can.onfigure), function(event, button, meta, carte) { + can.onfigure[button](event, can, carte) }); break } } @@ -85,3 +49,38 @@ Volcanos(chat.ONDETAIL, { }) }, }) +Volcanos(chat.ONFIGURE, { + "desktop\t>": function(event, can, carte) { + can.user.carteRight(event, can, {}, [{view: [html.ITEM, "", mdb.CREATE], onclick: function(event) { + can.onaction.create(event, can) + }}].concat(can.page.Select(can, can._action, "div.tabs>span.name", function(target) { + return {view: [html.ITEM, "", target.innerText+(can.page.ClassList.has(can, target.parentNode, html.SELECT)? " *": "")], + onclick: function(event) { target.click() }, + oncontextmenu: function(event) { can.user.carteRight(event, can, { + remove: function() { target.parentNode._close() }, + }, [], function() {}, carte) }, + } + })), function(event) {}, carte) + }, + "window\t>": function(event, can, carte) { + can.user.carteRight(event, can, {}, can.page.Select(can, can.ui.desktop, "fieldset>legend", function(legend) { + return {view: [html.ITEM, "", legend.innerText+(legend.parentNode.style["z-index"] == "10"? " *": "")], onclick: function(event) { + can.ondetail.select(can, legend.parentNode) + }} + }), function(event) {}, carte) + }, + "layout\t>": function(event, can, carte) { var list = can.page.SelectChild(can, can.ui.desktop, html.FIELDSET) + can.user.carteRight(event, can, { + grid: function(event) { for (var i = 0; i*i < list.length; i++) {} for (var j = 0; j*i < list.length; j++) {} + var height = (can.ConfHeight()-25)/j, width = can.ConfWidth()/i; can.core.List(list, function(target, index) { + can.page.style(can, target, html.TOP, parseInt(index/i)*height+25, html.LEFT, index%i*width) + target._can.onimport.size(target._can, height, width) + }) + }, + free: function(event) { can.core.List(list, function(target, index) { + can.page.style(can, target, html.TOP, can.ConfHeight()/2/list.length*index+25, html.LEFT, can.ConfWidth()/2/list.length*index) + }) }, + }, [], function(event) {}, carte) + }, + full: function(event, can, carte) { can.onaction.full(event, can) }, +}) diff --git a/src/macos/finder.js b/src/macos/finder.js index 29ec9186..8bb9978b 100644 --- a/src/macos/finder.js +++ b/src/macos/finder.js @@ -7,7 +7,7 @@ Volcanos(chat.ONIMPORT, { _init: function(can, msg) { can.onmotion.clear(can), c } can.onimport.layout(can) }) }); index == 0 && item.click() - }) }, + }), can.onmotion.hidden(can, can.ui.profile), can.onmotion.hidden(can, can.ui.display) }, icons: function(can, msg, target) { msg.Table(function(value) { value.icon = can.misc.PathJoin(value.icon||can.page.drawText(can, value.name, 80)) can.page.Append(can, target, [{view: html.ITEM, list: [{view: html.ICON, list: [{img: value.icon}]}, {view: [mdb.NAME, "", value.name]}], onclick: function(event) { can.sup.onexport.record(can.sup, value.name, mdb.NAME, value)