diff --git a/Zframework/widget.lua b/Zframework/widget.lua index ec4084b0..5118e86d 100644 --- a/Zframework/widget.lua +++ b/Zframework/widget.lua @@ -894,7 +894,7 @@ function textBox:reset() end function textBox:setTexts(t) self.texts=t - self.scrollPos=min(#self.texts,self.capacity) + self.scrollPos=0 end function textBox:clear() self.texts={} diff --git a/parts/scenes/net_rooms.lua b/parts/scenes/net_rooms.lua index 40764666..78349f5a 100644 --- a/parts/scenes/net_rooms.lua +++ b/parts/scenes/net_rooms.lua @@ -130,8 +130,8 @@ scene.widgetList={ roomList, passwordBox, WIDGET.newKey{name="setting",fText=TEXTURE.setting,x=1200,y=160,w=90,h=90,code=pressKey"s"}, - WIDGET.newText{name="refreshing",x=450,y=255,font=45,hideF=function()return not NET.getlock('fetchRoom')end}, - WIDGET.newText{name="noRoom", x=450,y=260,font=40,hideF=function()return roomList:getLen()>0 or NET.getlock('fetchRoom')end}, + WIDGET.newText{name="refreshing",x=450,y=240,font=45,hideF=function()return not NET.getlock('fetchRoom')end}, + WIDGET.newText{name="noRoom", x=450,y=245,font=40,hideF=function()return roomList:getLen()>0 or NET.getlock('fetchRoom')end}, WIDGET.newKey{name="refresh", x=250,y=630,w=140,h=120,font=35,code=fetchRoom,hideF=function()return fetchTimer>7 end}, WIDGET.newKey{name="new", x=510,y=630,w=260,h=120,font=30,code=pressKey"n"}, WIDGET.newKey{name="join", x=780,y=630,w=140,h=120,font=40,code=pressKey"return",hideF=function()return roomList:getLen()==0 or NET.getlock('enterRoom')end},