muzi
/
macUI
mirror of https://github.com/1099438829/macUI.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

轻度优化

This commit is contained in:
muzi 2018-12-13 13:26:21 +08:00
parent 411ddd7a0f
commit 8bc1fcd8fd
2 changed files with 47 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
css/macdefault.css
View File

@ -918,6 +918,19 @@ body {
.dock{ .dock{
width: 100%; width: 100%;
height:60px;
border-radius: 0px; border-radius: 0px;
} }
.dock .dock-container{
width: 100%;
border-radius: 0px;
}
.dock a.dock-item{
width: 100%;
margin-left: 25px;
float:left;
position: static;
}
} }

51
js/mac.js
View File

@ -551,7 +551,7 @@ window.Win10 = {
top: 30, top: 30,
'z-index': 100, 'z-index': 100,
}); });
$("#win10 .desktop").append("<div id='win10-desktop-scene' style='width: 100%;height: calc(100% - 40px);position: absolute;left: 0;top: 0; z-index: 0;background-color: transparent;'></div>") $("#win10 .desktop").append("<div id='win10-desktop-scene' style='width: 100%;height: calc(100% - 30px);position: absolute;left: 0;top: 30px; z-index: 0;background-color: transparent;'></div>")
} }
//属性绑定 //属性绑定
@ -608,8 +608,19 @@ window.Win10 = {
}, },
//渲染DOCK //渲染DOCK
renderDocks:function () { renderDocks:function () {
$('#dock').Fisheye( var cell_width=50;
{ var width=document.body.clientWidth ;
var docks=$(".dock .dock-container a");
var max_num=parseInt((width-40)/(cell_width+25))-1;
for (var i = 0; i <= docks.length; i++) {
if (i>=max_num) {
docks.eq(i).hide();
}else{
docks.eq(i).show();
}
}
if(width>768){
$('#dock').Fisheye({
maxWidth: 70, maxWidth: 70,
items: 'a', items: 'a',
itemsText: 'span', itemsText: 'span',
@ -619,20 +630,26 @@ window.Win10 = {
alignment : 'left', alignment : 'left',
valign: 'bottom', valign: 'bottom',
halign : 'center' halign : 'center'
} })
) }else{
$('.dock-container').css({'width':width});
var cell_width=50; for (var i = 0; i < max_num; i++) {
var width=document.body.clientWidth ;
var docks=$(".dock .dock-container a"); docks.on('mouseover', function(e) {
var max_num=parseInt(width/cell_width)-1; e.preventDefault();
for (var i = 0; i < docks.length; i++) { });
if (i>max_num) { docks.on('mouseout', function(e) {
docks.eq(i).hide(); e.preventDefault();
}else{ });
docks.eq(i).show(); docks.on('click', function(e) {
} e.preventDefault();
} });
docks.unbind("mouseover").unbind('mouseout').unbind('click').css({"width":cell_width});
if(i==0){
docks.eq(i).css("margin-left",0);
}
}
}
}, },
commandCenterToggle: function () { commandCenterToggle: function () {
if($("#win10_command_center").hasClass('hidden_right')){ if($("#win10_command_center").hasClass('hidden_right')){