MayaTheShy/Opus
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

Develop 1.8 #20

Merged
Kan18 merged 242 commits from develop-1.8 into master-1.8 2019-11-10 20:52:08 -05:00
Conversation 4 Commits 242 Files Changed 193 +6 -6
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3cc368f33a - Show all commits

3
sys/apps/Overview.lua
View File

@@ -194,7 +194,8 @@ UI.Icon.defaults = {
}
function UI.Icon:eventHandler(event)
if event.type == 'mouse_click' then
self:setFocus(self.button)
--self:setFocus(self.button)
self:emit({ type = self.button.event, button = self.button })
return true
elseif event.type == 'mouse_doubleclick' then
self:emit({ type = self.button.event, button = self.button })

9
sys/boot/kiosk.boot
View File

@@ -1,17 +1,16 @@
local os = _G.os
local parallel = _G.parallel
local peripheral = _G.peripheral
local settings = _G.settings
local settings = _G.settings
local term = _G.term
local mon = peripheral.find('monitor')
if mon then
term.redirect(mon)
if not settings.get('opus.kiosk.textscale') then
settings.set('opus.kiosk.textscale', .5)
if not settings.get('kiosk.textscale') then
settings.set('kiosk.textscale', .5)
end
mon.setTextScale(settings.get('opus.kiosk.textscale') or .5)
mon.setTextScale(settings.get('kiosk.textscale') or .5)
parallel.waitForAny(
function()