diff --git a/bricks/imgs/app_fullscreen.svg b/bricks/imgs/app_fullscreen.svg index aa78605..ad02393 100644 --- a/bricks/imgs/app_fullscreen.svg +++ b/bricks/imgs/app_fullscreen.svg @@ -1 +1 @@ - + diff --git a/bricks/imgs/app_minimize.svg b/bricks/imgs/app_minimize.svg index 2208b9b..c72b4cf 100644 --- a/bricks/imgs/app_minimize.svg +++ b/bricks/imgs/app_minimize.svg @@ -1 +1 @@ - + diff --git a/bricks/menu.js b/bricks/menu.js index 50e6e20..1552aa9 100644 --- a/bricks/menu.js +++ b/bricks/menu.js @@ -84,9 +84,9 @@ bricks.Menu = class extends bricks.VBox { var w = new bricks.HBox({cheight:this.item_cheight||2}); var iw, tw; if (item.icon){ - iw = new bricks.Icon({url:item.icon}); + iw = new bricks.Icon({url:item.icon, rate:1.3}); } else { - iw = new bricks.BlankIcon({}); + iw = new bricks.BlankIcon({rate:1.3}); } w.add_widget(iw); tw = new bricks.Text({ diff --git a/bricks/popup.js b/bricks/popup.js index 1ba780f..71c2471 100644 --- a/bricks/popup.js +++ b/bricks/popup.js @@ -417,10 +417,10 @@ bricks.PopupWindow = class extends bricks.Popup { tip:'Destroy this window' }, { - name:'minimax', + name:'minimize', icon:bricks_resource('imgs/app_minimize.svg'), dynsize:true, - tip:'minimax this window' + tip:'minimize this window' }, { name:'fullscreen', @@ -432,8 +432,8 @@ bricks.PopupWindow = class extends bricks.Popup { }); this.title_bar.add_widget(this.tb_w); this.tb_w.bind('delete', this.destroy.bind(this)); - this.tb_w.bind('minimax', this.dismiss.bind(this)); - this.tb_w.bind('fullscreen', this.enter_fullscreen.bind(this)); + this.tb_w.bind('minimize', this.dismiss.bind(this)); + this.tb_w.bind('fullscreen', this.content_w.enter_fullscreen.bind(this.content_w)); if (this.title){ this.title_w = new bricks.Text({text:this.title}); this.title_bar.add_widget(this.title_w);