diff --git a/gui.lua b/gui.lua index 134283a..d22f695 100644 --- a/gui.lua +++ b/gui.lua @@ -13,8 +13,11 @@ public.config = { edge_size = 1.5, font = [[Fonts\ARIALN.TTF]], small_font_size = 13, + small_font_size2 = 14, medium_font_size = 15, - large_font_size = 18, + medium_font_size2 = 16, + large_font_size = 17, + large_font_size2 = 18, huge_font_size = 23, } @@ -78,8 +81,6 @@ function m.LOAD() local text = button:GetFontString() text:SetFont([[Fonts\FRIZQT__.ttf]], 10) text:SetShadowOffset(1, -1) --- text:SetPoint('TOPLEFT', 18, 0) --- text:SetPoint('BOTTOMRIGHT', -8, 0) local highlight = getglobal('DropDownList1Button'..i..'Highlight') highlight:SetAllPoints() highlight:SetDrawLayer('BACKGROUND') @@ -219,7 +220,7 @@ function public.tab_group(parent, orientation) tab.text:SetPoint('RIGHT', -3, -1) tab.text:SetJustifyH('CENTER') tab.text:SetJustifyV('CENTER') - tab.text:SetFont(m.config.font, m.config.large_font_size) + tab.text:SetFont(m.config.font, m.config.large_font_size2) tab:SetFontString(tab.text) tab:SetText(text) @@ -389,12 +390,10 @@ function public.item(parent) icon:EnableMouse(nil) item.texture = getglobal(icon:GetName()..'Icon') item.texture:SetTexCoord(0.06,0.94,0.06,0.94) - item.name = aux.gui.label(icon) + item.name = aux.gui.label(icon, 15) item.name:SetJustifyH('LEFT') item.name:SetPoint('LEFT', icon, 'RIGHT', 10, 0) item.name:SetPoint('RIGHT', item, 'RIGHT', -10, 0.5) - item.name:SetPoint('TOP', item, 'TOP', -5, 0) - item.name:SetPoint('BOTTOM', item, 'BOTTOM', 5, 0) item.count = getglobal(icon:GetName()..'Count') item.count:SetTextHeight(17) return item @@ -484,6 +483,7 @@ function public.slider(parent) local editbox = m.editbox(slider) editbox:SetPoint('LEFT', slider, 'RIGHT', 5, 0) editbox:SetWidth(50) + editbox:SetHeight(18) editbox:SetJustifyH('CENTER') editbox:SetFont(m.config.font, 17) diff --git a/tables/listing.lua b/tables/listing.lua index d7bd352..48af33d 100644 --- a/tables/listing.lua +++ b/tables/listing.lua @@ -4,7 +4,7 @@ local ST_COUNT = 0 local ST_ROW_HEIGHT = 15 local ST_ROW_TEXT_SIZE = 14 -local ST_HEAD_HEIGHT = 27 +local ST_HEAD_HEIGHT = 26.3 local ST_HEAD_SPACE = 2 local DEFAULT_COL_INFO = {{width=1}} diff --git a/tabs/search/core.lua b/tabs/search/core.lua index 97180ed..7d092d7 100644 --- a/tabs/search/core.lua +++ b/tabs/search/core.lua @@ -911,9 +911,9 @@ function private.remove_post_filter() end function private.update_filter_display() - local lines = aux.util.size(aux.util.filter(m.post_components, function(component) return component[1] == 'operator' and component[2] ~= 'not' end)) - local width_scale = max(260/m.filter_display:GetStringWidth()) - local height_scale = min((200 / lines) / 18) + local lines = aux.util.size(aux.util.filter(m.post_components, function(component) return not (component[1] == 'operator' and component[2] == 'not') end)) + local width_scale = 250/m.filter_display:GetStringWidth() + local height_scale = (180 / lines) / 18 m.filter_display.scale_frame:SetScale(min(1, width_scale, height_scale)) m.filter_display:SetText(aux.filter.indented_post_query_string(m.post_components)) end diff --git a/tabs/search/frames.lua b/tabs/search/frames.lua index a4c07d5..b7cf382 100644 --- a/tabs/search/frames.lua +++ b/tabs/search/frames.lua @@ -258,7 +258,7 @@ aux.search_tab.FRAMES(function(m, public, private) aux.gui.horizontal_line(m.frame, -40) end do - local btn = aux.gui.button(m.frame, aux.gui.config.large_font_size) + local btn = aux.gui.button(m.frame, aux.gui.config.large_font_size2) btn:SetPoint('BOTTOMLEFT', AuxFrameContent, 'TOPLEFT', 10, 8) btn:SetWidth(243) btn:SetHeight(22) @@ -267,7 +267,7 @@ aux.search_tab.FRAMES(function(m, public, private) private.search_results_button = btn end do - local btn = aux.gui.button(m.frame, aux.gui.config.large_font_size) + local btn = aux.gui.button(m.frame, aux.gui.config.large_font_size2) btn:SetPoint('TOPLEFT', m.search_results_button, 'TOPRIGHT', 5, 0) btn:SetWidth(243) btn:SetHeight(22) @@ -276,7 +276,7 @@ aux.search_tab.FRAMES(function(m, public, private) private.saved_searches_button = btn end do - local btn = aux.gui.button(m.frame, aux.gui.config.large_font_size) + local btn = aux.gui.button(m.frame, aux.gui.config.large_font_size2) btn:SetPoint('TOPLEFT', m.saved_searches_button, 'TOPRIGHT', 5, 0) btn:SetWidth(243) btn:SetHeight(22) @@ -541,7 +541,7 @@ aux.search_tab.FRAMES(function(m, public, private) aux.gui.set_content_style(frame) local scale_frame = CreateFrame('Frame', nil, frame) scale_frame:SetAllPoints() - local display = aux.gui.label(scale_frame, aux.gui.config.large_font_size) + local display = aux.gui.label(scale_frame, aux.gui.config.large_font_size2) display:SetAllPoints() display:SetJustifyH('LEFT') display:SetJustifyV('TOP')