diff --git a/Zframework/widget.lua b/Zframework/widget.lua index 2732cc2a..8734d4be 100644 --- a/Zframework/widget.lua +++ b/Zframework/widget.lua @@ -871,7 +871,7 @@ function textBox:update() end function textBox:push(t) ins(self.texts,t) - if self.scrollPos==#self.texts-1 then + if self.scrollPos==#self.texts-1 and not(self.hide==true or self.hide and self.hide())then self.scrollPos=#self.texts else self.new=true @@ -902,9 +902,6 @@ function textBox:scroll(n) self.scrollPos=max(self.scrollPos+n,min(#self.texts,self.capacity)) else self.scrollPos=min(self.scrollPos+n,#self.texts) - if self.scrollPos==#self.texts then - self.new=false - end end end function textBox:clear() @@ -918,6 +915,10 @@ function textBox:draw() local scroll=self.scrollPos local cap=self.capacity + --Update new message status, necessary when hide==true + if self.scrollPos==#self.texts then + self.new=false + end --Background gc.setColor(0,0,0,.3) diff --git a/parts/scenes/net_game.lua b/parts/scenes/net_game.lua index e0e60feb..c9b6e1f1 100644 --- a/parts/scenes/net_game.lua +++ b/parts/scenes/net_game.lua @@ -237,7 +237,7 @@ function scene.draw() drawFWM() --Players - for p=textBox.hide and 1 or 2,#PLAYERS do + for p=1,#PLAYERS do PLAYERS[p]:draw() end @@ -278,11 +278,12 @@ function scene.draw() --Profile drawSelfProfile() end + --New message - if textBox.new and textBox.hide then - setFont(30) - gc.setColor(1,TIME()%.4<.2 and 1 or 0,0) - gc.print("M",460,15) + if textBox.new then + setFont(40) + gc.setColor(1,.5+.5*math.sin(TIME()*26),0) + gc.print("M",430,10) end end scene.widgetList={ @@ -293,7 +294,6 @@ scene.widgetList={ return playing or NET.serverGaming or - not textBox.hide or PLY_NET[1].ready or NET.getlock('ready') end}, @@ -302,7 +302,6 @@ scene.widgetList={ return playing or NET.serverGaming or - not textBox.hide or not PLY_NET[1].ready or NET.getlock('ready') end},