Merge pull request #11498 from zwim/optimize_rounded

UI: optimize and anti-alias rounded rectangles
koreader · Mar 8, 2024 · c8f39c3 · c8f39c3
2 parents dd8560c + 58b3367
commit c8f39c3
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 8 deletions.
diff --git a/base b/base
diff --git a/frontend/apps/filemanager/filemanagermenu.lua b/frontend/apps/filemanager/filemanagermenu.lua
@@ -624,6 +624,15 @@ To:
             end,
         })
     end
+    table.insert(self.menu_items.developer_options.sub_item_table, {
+        text = _("Anti-alias rounded corners"),
+        checked_func = function()
+            return G_reader_settings:nilOrTrue("anti_alias_ui")
+        end,
+        callback = function()
+            G_reader_settings:flipNilOrTrue("anti_alias_ui")
+        end,
+    })
     --- @note: Currently, only Kobo implements this quirk
     if Device:hasEinkScreen() and Device:isKobo() then
         table.insert(self.menu_items.developer_options.sub_item_table, {

diff --git a/frontend/ui/widget/container/framecontainer.lua b/frontend/ui/widget/container/framecontainer.lua
@@ -96,7 +96,7 @@ function FrameContainer:paintTo(bb, x, y)
     if not self.dimen then
         self.dimen = Geom:new{
             x = x, y = y,
-            w = my_size.w, h = my_size.h
+            w = my_size.w, h = my_size.h,
         }
     else
         self.dimen.x = x
@@ -110,11 +110,16 @@ function FrameContainer:paintTo(bb, x, y)
         shift_x = container_width - my_size.w
     end
 
-    --- @todo get rid of margin here?  13.03 2013 (houqp)
     if self.background then
-        bb:paintRoundedRect(x, y,
-                            container_width, container_height,
-                            self.background, self.radius)
+        if not self.radius or not self.bordersize then
+            bb:paintRoundedRect(x, y,
+                                container_width, container_height,
+                                self.background, self.radius)
+        else
+            bb:paintRoundedRect(x, y,
+                                container_width, container_height,
+                                self.background, self.radius + self.bordersize)
+        end
     end
     if self.stripe_width and self.stripe_color and not self.stripe_over then
         -- (No support for radius when hatched/stripe)
@@ -130,10 +135,11 @@ function FrameContainer:paintTo(bb, x, y)
             self.inner_bordersize, self.color, self.radius)
     end
     if self.bordersize > 0 then
+        local anti_alias = G_reader_settings:nilOrTrue("anti_alias_ui")
         bb:paintBorder(x + self.margin, y + self.margin,
             container_width - self.margin * 2,
             container_height - self.margin * 2,
-            self.bordersize, self.color, self.radius)
+            self.bordersize, self.color, self.radius, anti_alias)
     end
     if self[1] then
         self[1]:paintTo(bb,

diff --git a/frontend/ui/widget/container/inputcontainer.lua b/frontend/ui/widget/container/inputcontainer.lua
@@ -74,7 +74,7 @@ function InputContainer:paintTo(bb, x, y)
         local content_size = self[1]:getSize()
         self.dimen = Geom:new{
             x = x, y = y,
-            w = content_size.w, h = content_size.h
+            w = content_size.w, h = content_size.h,
         }
     else
         self.dimen.x = x