diff --git a/core/chat/macos/desktop.css b/core/chat/macos/desktop.css index 8cfa9f7d..c0c9bb0a 100644 --- a/core/chat/macos/desktop.css +++ b/core/chat/macos/desktop.css @@ -61,7 +61,8 @@ fieldset.macos.desktop>div.output>div.desktop>fieldset.web.chat.location>div.act fieldset.macos.desktop>div.output>div.desktop>fieldset.web.chat.location>div.action>div.item.feature select { width:60px; } fieldset.macos.desktop>div.output>div.desktop>fieldset.web.chat.iframe>form.option>div.item.hash>input { width:var(--river-width); } fieldset.macos.desktop>div.output>div.desktop>fieldset.web.chat.macos.finder>div.status { display:none; } -fieldset.macos.menu>div.output>div.item { padding:0 var(--input-padding); height:var(--desktop-menu-height); float:right; } +fieldset.macos.menu>div.output>div.item { padding:0 var(--button-padding); height:var(--desktop-menu-height); float:right; } +fieldset.macos.menu>div.output>div.item.avatar { padding:0; } fieldset.macos.menu>div.output>div.item.avatar>img { height:var(--desktop-menu-height); } fieldset.macos.menu>div.output>div.menu { padding:0 var(--button-padding); float:left; } fieldset.macos.menu>div.output>div.tabs { font-style:italic; padding:0 var(--button-padding); float:left; } diff --git a/core/chat/macos/desktop.js b/core/chat/macos/desktop.js index d5b969d6..13b0a40c 100644 --- a/core/chat/macos/desktop.js +++ b/core/chat/macos/desktop.js @@ -17,6 +17,7 @@ Volcanos(chat.ONIMPORT, { switch (value) { case "notifications": can.ui.notifications._output.innerHTML && can.onmotion.toggle(can, can.ui.notifications._target); break case "searchs": can.onaction._search(can); break + case "qrcode": can.sup.onaction["生成链接"]({}, can.sup); break case mdb.CREATE: can.onaction.create(event, can); break case html.DESKTOP: var carte = can.user.carte(event, can, {}, can.core.Item(can.onfigure), function(event, button, meta, carte) { diff --git a/core/chat/macos/menu.js b/core/chat/macos/menu.js index d67c3718..03ddd29c 100644 --- a/core/chat/macos/menu.js +++ b/core/chat/macos/menu.js @@ -1,7 +1,8 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg) { can.page.style(can, can._output, html.MAX_WIDTH, "") can.page.Append(can, can._output, can.user.header(can)), can.page.Append(can, can._output, [ - {view: [html.ITEM], list: [{img: can.page.drawText(can, "n", 25, 0, 20)}], onclick: function(event) { can.sup.onexport.record(can, "notifications") }}, - {view: [html.ITEM], list: [{img: can.page.drawText(can, "s", 25, 0, 20)}], onclick: function(event) { can.sup.onexport.record(can, "searchs") }}, + {view: [html.ITEM], list: [{icon: icon.notifications}], onclick: function(event) { can.sup.onexport.record(can, "notifications") }}, + {view: [html.ITEM], list: [{icon: icon.search}], onclick: function(event) { can.sup.onexport.record(can, "searchs") }}, + {view: [html.ITEM], list: [{icon: icon.qrcode}], onclick: function(event) { can.sup.onexport.record(can, "qrcode") }}, ].concat(msg.Table(function(item) { return {view: [html.ITEM], list: [{img: can.page.drawText(can, item.name||item.index, 25, 0, 20)}], onclick: function(event) { can.sup.onexport.record(can, item) }} }), [