awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

menubar.icon_theme.lookup_icon: check for dist in outer loop

This commit is contained in:
Daniel Hahler 2015-10-12 01:01:04 +02:00
parent 75341d9e38
commit 7d9b78c13c
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/menubar/icon_theme.lua
View File

@ -168,16 +168,18 @@ local lookup_icon = function(self, icon_name, icon_size)
local minimal_size = 0xffffffff -- Any large number will do.
local closest_filename = nil
for _, subdir in ipairs(self.index_theme:get_subdirectories()) do
for _, basedir in ipairs(self.base_directories) do
for _, ext in ipairs(self.extensions) do
local filename = string.format("%s/%s/%s/%s.%s",
basedir, self.icon_theme_name, subdir,
icon_name, ext)
if not checked_already[filename] then
local dist = directory_size_distance(self, subdir, icon_size)
if awful.util.file_readable(filename) and dist < minimal_size then
closest_filename = filename
minimal_size = dist
local dist = directory_size_distance(self, subdir, icon_size)
if dist < minimal_size then
for _, basedir in ipairs(self.base_directories) do
for _, ext in ipairs(self.extensions) do
local filename = string.format("%s/%s/%s/%s.%s",
basedir, self.icon_theme_name, subdir,
icon_name, ext)
if not checked_already[filename] then
if awful.util.file_readable(filename) then
closest_filename = filename
minimal_size = dist
end
end
end
end