From 3fea2874c4eac00008cffc62f6ba2b0fbbc1314e Mon Sep 17 00:00:00 2001 From: IgorTimofeev Date: Wed, 14 Sep 2022 01:47:05 +0300 Subject: [PATCH] Revert "Merge pull request #475 from Axeer/master" This reverts commit 27d9c0c9743adc9e1c6d7fd0c31a365c11fd97a2, reversing changes made to fe601856cc16624039cf7c17923252eb243f2e5c. --- Libraries/GUI.lua | 8 ++------ Libraries/System.lua | 1 - 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Libraries/GUI.lua b/Libraries/GUI.lua index fdeff7f4..108a4672 100755 --- a/Libraries/GUI.lua +++ b/Libraries/GUI.lua @@ -886,12 +886,8 @@ end -------------------------------------------------------------------------------- function GUI.actionButtons(x, y, fatSymbol) - local symbol = fatSymbol and "●" - - if _G._OCVERSION <= 175 then - symbol = fatSymbol and "⬤" or "●" - end - + local symbol = fatSymbol and "⬤" or "●" + local container = GUI.container(x, y, 5, 1) container.close = container:addChild(GUI.button(1, 1, 1, 1, nil, 0xFF4940, nil, 0x992400, symbol)) container.minimize = container:addChild(GUI.button(3, 1, 1, 1, nil, 0xFFB640, nil, 0x996D00, symbol)) diff --git a/Libraries/System.lua b/Libraries/System.lua index ed849c50..254fc4f7 100755 --- a/Libraries/System.lua +++ b/Libraries/System.lua @@ -3174,7 +3174,6 @@ _G.print = function(...) system.consoleWindow:focus() end -_G._OCVERSION = tonumber(tostring(filesystem.read("/lib/core/boot.lua"):match("OpenOS %d+.%d+.%d+"):match("%d+.%d+.%d+"):gsub("%.", ""))) -------------------------------------------------------------------------------- return system