From 59a72ade2693f2e3d2b5a73d9671d211e56e69d0 Mon Sep 17 00:00:00 2001 From: harveyshao Date: Mon, 13 Feb 2023 22:30:45 +0800 Subject: [PATCH] opt some --- index.css | 6 ++++-- lib/user.js | 2 +- plugin/local/code/inner.js | 8 +++++++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/index.css b/index.css index f32d51a5..52179d78 100644 --- a/index.css +++ b/index.css @@ -126,7 +126,8 @@ form.option>div.item>label, div.action>div.item>label, .hidden, .hide { display: form.option>div.cmd, form.option>div.textarea { width:100%; } textarea { resize:vertical; } legend, form.option, form.option>div.item, div.action, div.action>div.item, div.action>div.tabs, fieldset>div.status>div.item, div.layout.flex>* { float:left; } div.action, div.output, div.status, div.project, div.display, div.profile, div.content, table.content, table.content td, div.code, div.plug, div.story, div.toast, div.carte, fieldset.input { overflow:auto; } -fieldset>div.output, fieldset>div.status, div.item.textarea, div.project div.item, div.content:not(.item), div.code, div.story[data-type=spark] { clear:both; } +div.output, fieldset>div.status, div.item.textarea, div.project div.item, div.content:not(.item), div.code, div.story[data-type=spark] { clear:both; } +// fieldset>div.output, fieldset>div.status, div.item.textarea, div.project div.item, div.content:not(.item), div.code, div.story[data-type=spark] { clear:both; } fieldset>div.status>legend { margin-left:2px; margin-right:0; height:30px; float:right; clear:none; } fieldset.plugin:not(.output):not(.float):not(.full):not(.cmd) { padding:10px; margin:10px; } fieldset.plugin:not(.float):not(.full):not(.cmd)>legend { float:none; } @@ -144,7 +145,7 @@ div.plug { font-style:italic; } div.item.text { position:relative; } div.item.text>span.icon.delete { font-size:20px; line-height:28px; position:absolute; top:2px; right:10px; visibility:hidden; } div.item.text:hover>span.icon.delete { visibility:visible; } -form.option>div.icon { font-size:26px; margin-right:5px; display:none; } +form.option>div.icon { font-size:26px; margin-right:5px; height:31px; display:none; } form.option>div.icon:hover { background-color:white; } fieldset.story>form.option>div.icon { display:block; } fieldset.float>form.option>div.icon { display:block; } @@ -329,4 +330,5 @@ fieldset.panel.Action>div.output::-webkit-scrollbar { width:0 !important; height div.story[data-type=spark]::-webkit-scrollbar { width:0 !important; height:0 !important; } div.project::-webkit-scrollbar { width:0 !important; height:0 !important; } div.content::-webkit-scrollbar { width:0 !important; height:0 !important; } +div.carte::-webkit-scrollbar { width:0 !important; height:0 !important; } diff --git a/lib/user.js b/lib/user.js index 91af710c..8a55483c 100644 --- a/lib/user.js +++ b/lib/user.js @@ -121,7 +121,7 @@ Volcanos("user", { return item === ""? /* 0.space */ {type: html.HR}: can.base.isString(item)||can.base.isNumber(item)? /* 1.string */ {view: [html.ITEM, html.DIV, can.user.trans(can, item, trans)], onclick: function(event) { click(event, item) }, onmouseenter: function(event) { remove_sub(carte) } }: can.base.isArray(item)? /* 2.array */ {view: html.ITEM, list: [{text: can.user.trans(can, item[0], trans)}, {text: [ice.SP+can.page.unicode.gt, "", [html.ICON, "gt"]]}], onmouseenter: subs, onclick: subs}: /* 3.object */ item })}]); can.onkeymap.prevent(event), can.page.Select(can, ui._target, html.IMG, function(target) { target.onload = function() { can.onlayout.figure(event, can, ui._target) } }) - var carte = {_target: ui._target, _parent: parent, layout: can.onlayout.figure(event, can, ui._target, false, 0.6), close: function() { can.page.Remove(can, ui._target) }}; return carte + var carte = {_target: ui._target, _parent: parent, layout: can.onlayout.figure(event, can, ui._target, false, 0.8), close: function() { can.page.Remove(can, ui._target) }}; return carte }, carteRight: function(event, can, meta, list, cb, parent) { var carte = can.user.carte(event, can, meta, list, cb, parent) return can.onlayout.figure(event, can, carte._target, true), carte diff --git a/plugin/local/code/inner.js b/plugin/local/code/inner.js index da3bafcd..b74407c5 100644 --- a/plugin/local/code/inner.js +++ b/plugin/local/code/inner.js @@ -223,7 +223,13 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg, cb, target) { can.onmotion.cl }, can.ui.plug.parentNode) }, layout: function(can) { if (can.isSimpleMode()) { return can.page.style(can, can.ui.content, html.WIDTH, can.ConfWidth()) } - if (can.isCmdMode()) { can.ConfHeight(can.page.height()), can.ConfWidth(can.page.width()) } + if (can.isCmdMode()) { + if (can.user.isWindows) { + can.ConfHeight(can.page.height()), can.ConfWidth(can.page.width()-8) + } else { + can.ConfHeight(can.page.height()), can.ConfWidth(can.page.width()) + } + } can.ui.size = {profile: can.db.profile_size[can.onexport.keys(can)]||0.5, display: can.db.display_size[can.onexport.keys(can)]||3*html.ACTION_HEIGHT} can.ui.layout(can.ConfHeight(), can.ConfWidth(), 0, function(content_height, content_width) { var sub = can.ui.content._plugin; if (!sub) { return } if (content_height == sub.ConfHeight()+sub.onexport.actionHeight(sub)+sub.onexport.statusHeight(sub) && content_width == sub.ConfWidth()) { return }