deon/glava
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix glava-config gtk feature detection

Browse Source
This commit is contained in:
Jarcode
2019-09-07 02:45:30 -07:00
parent 90d275f2cd
commit e46967cc02
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
glava-config/window.lua
View File

@@ -31,7 +31,7 @@ return function()
-- The old chooser, however, is objectively better so let's try -- The old chooser, however, is objectively better so let's try
-- to use it if it exists. -- to use it if it exists.
local use_old_chooser = true local use_old_chooser = true
if Gtk.ColorSelectionDialog == nil then if Gtk.get_major_version() >= 4 then
use_old_chooser = false use_old_chooser = false
end end
@@ -257,11 +257,11 @@ return function()
local widget = Gtk.SpinButton { local widget = Gtk.SpinButton {
hexpand = true, hexpand = true,
adjustment = Gtk.Adjustment { adjustment = Gtk.Adjustment {
lower = attrs.lower or 0, lower = attrs.lower or 0,
upper = attrs.upper or 100, upper = attrs.upper or 100,
page_increment = attrs.increment or 1, page_size = 1,
page_size = attrs.increment or 1, step_increment = attrs.increment and (attrs.increment / 10) or 0.1,
step_increment = attrs.increment or 1 page_increment = attrs.increment or 1
}, },
width_chars = attrs.width or 6, width_chars = attrs.width or 6,
numeric = true, numeric = true,
@@ -277,11 +277,11 @@ return function()
local widget = Gtk.SpinButton { local widget = Gtk.SpinButton {
hexpand = true, hexpand = true,
adjustment = Gtk.Adjustment { adjustment = Gtk.Adjustment {
lower = attrs.lower or 0, lower = attrs.lower or 0,
upper = attrs.upper or 100, upper = attrs.upper or 100,
page_increment = attrs.increment or 1, page_size = 1,
page_size = attrs.increment or 1, step_increment = attrs.increment and math.min(math.floor((attrs.increment / 10)), 1) or 1,
step_increment = attrs.increment or 1 page_increment = attrs.increment or 1
}, },
width_chars = attrs.width or 6, width_chars = attrs.width or 6,
numeric = true, numeric = true,
@@ -316,8 +316,7 @@ return function()
cr:arc(unpack(aargc)) cr:arc(unpack(aargc))
cr:fill() cr:fill()
end end
-- Gtk 3/4 compat if Gtk.get_major_version() >= 4 then
if area.set_draw_func then
area:set_draw_func(draw) area:set_draw_func(draw)
else else
area.on_draw = draw area.on_draw = draw