From bbcf3f61fa954d67f8f053c2cc5c43e5360c5334 Mon Sep 17 00:00:00 2001
From: Vadim Lopatin <coolreader.org@gmail.com>
Date: Fri, 8 Mar 2024 11:44:42 +0000
Subject: [PATCH] HDPI improvements

---
 views/res/hdpi/hdpi_find_case_sensitive.png | Bin 0 -> 4314 bytes
 views/res/hdpi/hdpi_find_whole_words.png    | Bin 0 -> 4313 bytes
 views/res/theme_default.xml                 |  74 ++++++++++----------
 views/standard_resources.list               |   2 +
 4 files changed, 39 insertions(+), 37 deletions(-)
 create mode 100644 views/res/hdpi/hdpi_find_case_sensitive.png
 create mode 100644 views/res/hdpi/hdpi_find_whole_words.png

diff --git a/views/res/hdpi/hdpi_find_case_sensitive.png b/views/res/hdpi/hdpi_find_case_sensitive.png
new file mode 100644
index 0000000000000000000000000000000000000000..272c39dd03860b866b9ad0159f337c037382c304
GIT binary patch
literal 4314
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
W^EwyT+NJ!9p>h<K+7A>wx#52pI}O_a

literal 0
HcmV?d00001

diff --git a/views/res/hdpi/hdpi_find_whole_words.png b/views/res/hdpi/hdpi_find_whole_words.png
new file mode 100644
index 0000000000000000000000000000000000000000..d07896565feabe4eae2edcdd7b69bdbec139d38e
GIT binary patch
literal 4313
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
Y8U918>^s|V2j-%&=NH+I<ZWvBA2v%Ct^fc4

literal 0
HcmV?d00001

diff --git a/views/res/theme_default.xml b/views/res/theme_default.xml
index 98c77170..8d67e502 100644
--- a/views/res/theme_default.xml
+++ b/views/res/theme_default.xml
@@ -308,15 +308,15 @@ OB        fontSize="10pt"
 
     <style id="EDIT_LINE"
         backgroundImageId="editbox_background"
-        padding="4,4,4,4"
-        margins="2,2,2,2"
+        padding="3pt,3pt,3pt,3pt"
+        margins="1pt,1pt,1pt,1pt"
         minWidth="40"
         />
     <style id="EDIT_BOX"
         fontFace="Menlo,Consolas,DejaVuSansMono,Lucida Sans Typewriter,Courier New,Lucida Console"
         backgroundImageId="editbox_background"
-        padding="2,2,2,2"
-        margins="2,2,2,2"
+        padding="2pt,2pt,2pt,2pt"
+        margins="2pt,2pt,2pt,2pt"
         minWidth="100"
         minHeight="60"
         layoutWidth="FILL_PARENT"
@@ -327,8 +327,8 @@ OB        fontSize="10pt"
         fontSize="9pt"
         fontFamily="MonoSpace"
         backgroundImageId="editbox_background"
-        padding="2,2,2,2"
-        margins="2,2,2,2"
+        padding="2pt,2pt,2pt,2pt"
+        margins="2pt,2pt,2pt,2pt"
         minWidth="100"
         minHeight="60"
         layoutWidth="FILL_PARENT"
@@ -336,16 +336,16 @@ OB        fontSize="10pt"
         />
     <style id="LIST_BOX"
         backgroundImageId="editbox_background"
-        padding="2,2,2,2"
-        margins="2,2,2,2"
+        padding="2pt,2pt,2pt,2pt"
+        margins="2pt,2pt,2pt,2pt"
         layoutWidth="FILL_PARENT"
         layoutHeight="FILL_PARENT"
         />
     <style id="EDIT_BOX_NO_FRAME"
         fontFace="Menlo,Consolas,DejaVuSansMono,Lucida Sans Typewriter,Courier New,Lucida Console"
         backgroundColor="#FFFFFF"
-        padding="2,2,2,2"
-        margins="2,2,2,2"
+        padding="2pt,2pt,2pt,2pt"
+        margins="2pt,2pt,2pt,2pt"
         minWidth="100"
         minHeight="60"
         layoutWidth="FILL_PARENT"
@@ -353,8 +353,8 @@ OB        fontSize="10pt"
         />
     <style id="STRING_GRID"
         backgroundImageId="editbox_background"
-        padding="2,2,2,2"
-        margins="2,2,2,2"
+        padding="2pt,2pt,2pt,2pt"
+        margins="2pt,2pt,2pt,2pt"
         minWidth="100"
         minHeight="60"
         layoutWidth="FILL_PARENT"
@@ -362,8 +362,8 @@ OB        fontSize="10pt"
         />
     <style id="FILE_DIALOG_GRID"
         backgroundImageId="editbox_background"
-        padding="2,2,2,2"
-        margins="2,2,2,2"
+        padding="2pt,2pt,2pt,2pt"
+        margins="2pt,2pt,2pt,2pt"
         minWidth="100"
         minHeight="60"
         layoutWidth="FILL_PARENT"
@@ -373,20 +373,20 @@ OB        fontSize="10pt"
         backgroundColor="#eceffa"
         layoutWidth="FILL_PARENT"
         layoutHeight="WRAP_CONTENT"
-        padding="1,1,1,1"
+        padding="1pt,1pt,1pt,1pt"
 	layoutWeight="0"
         />
     <style id="DOCK_HOST"
         backgroundColor="#eceffa"
         layoutWidth="FILL_PARENT"
         layoutHeight="FILL_PARENT"
-        padding="2,2,2,2"
+        padding="2pt,2pt,2pt,2pt"
         />
     <style id="DOCK_HOST_BODY"
         layoutWidth="FILL_PARENT"
         layoutHeight="FILL_PARENT"
         padding="0,0,0,0"
-        margins="3,3,3,3"
+        margins="3pt,3pt,3pt,3pt"
         />
     <style id="DOCK_WINDOW"
         backgroundImageId="dock_window_background"
@@ -399,20 +399,20 @@ OB        fontSize="10pt"
         backgroundImageId="popup_window_background"
         layoutWidth="FILL_PARENT"
         layoutHeight="FILL_PARENT"
-        padding="1,1,1,1"
-        margins="4,4,4,4"
+        padding="1pt,1pt,1pt,1pt"
+        margins="4pt,4pt,4pt,4pt"
         />
     <style id="DOCK_WINDOW_CAPTION"
         backgroundImageId="dock_window_caption_background"
         layoutWidth="FILL_PARENT"
         layoutHeight="WRAP_CONTENT"
-        padding="1,1,1,1"
+        padding="1pt,1pt,1pt,1pt"
         />
     <style id="DOCK_WINDOW_CAPTION_LABEL"
         textColor="#000000"
         layoutWidth="FILL_PARENT"
         layoutHeight="WRAP_CONTENT"
-        padding="3,3,3,3"
+        padding="3pt,3pt,3pt,3pt"
         align="Left|VCenter"
         />
     <style id="DOCK_WINDOW_BODY"
@@ -425,35 +425,35 @@ OB        fontSize="10pt"
         backgroundImageId="toolbar_host_background"
         layoutWidth="FILL_PARENT"
         layoutHeight="WRAP_CONTENT"
-        padding="1,1,1,1"
+        padding="1pt,1pt,1pt,1pt"
         />
     <style id="TOOLTIP"
         backgroundImageId="tooltip_background"
         layoutWidth="WRAP_CONTENT"
         layoutHeight="WRAP_CONTENT"
-        margins="2,7,2,1"
-        padding="3,3,3,3"
+        margins="2pt,5pt,2pt,1pt"
+        padding="2pt,2pt,2pt,2pt"
 	textColor="#404040"
         />
     <style id="TOOLBAR"
         backgroundImageId="toolbar_background"
         layoutWidth="WRAP_CONTENT"
         layoutHeight="WRAP_CONTENT"
-        margins="2,1,2,1"
+        margins="2pt,1pt,2pt,1pt"
         />
     <style id="TOOLBAR_BUTTON"
         backgroundImageId="toolbar_button_background"
         align="Center"
-        margins="1,1,1,1"
-        padding="2,2,2,2"
+        margins="1pt,1pt,1pt,1pt"
+        padding="2pt,2pt,2pt,2pt"
         >
         <state state_enabled="false" alpha="160" backgroundImageId="toolbar_button_null"/>
     </style>
     <style id="TOOLBAR_CONTROL"
         backgroundImageId="toolbar_control_background"
         align="Center"
-        margins="1,1,1,1"
-        padding="2,2,2,2"
+        margins="1pt,1pt,1pt,1pt"
+        padding="2pt,2pt,2pt,2pt"
         >
         <state state_enabled="false" alpha="160" backgroundImageId="@null"/>
     </style>
@@ -491,20 +491,20 @@ OB        fontSize="10pt"
     </style>
 
     <style id="SETTINGS_TREE"
-        margins="8,8,8,8"
+        margins="5pt,5pt,5pt,5pt"
         backgroundColor="#FFFFFF"
         layoutWeight="3"
     />
 
     <style id="SETTINGS_PAGES"
-        margins="0,8,8,8"
-        padding="4,4,4,4"
+        margins="0,8pt,8pt,8pt"
+        padding="4pt,4pt,4pt,4pt"
         layoutWidth="FILL_PARENT"
         layoutWeight="5"
     />
 
     <style id="SETTINGS_PAGE_TITLE"
-        margins="4,4,4,14"
+        margins="4pt,4pt,4pt,10pt"
 	fontSize="120%"
 	layoutWeight="0"
         layoutWidth="FILL_PARENT"
@@ -513,8 +513,8 @@ OB        fontSize="10pt"
     <style id="RESIZER_VERTICAL"
         layoutWidth="FILL_PARENT"
         layoutHeight="WRAP_CONTENT"
-	minHeight="7"
-	maxHeight="7"
+	minHeight="7pt"
+	maxHeight="7pt"
 	backgroundColor="#E0E0E0">
         <state state_focused="true" backgroundColor="#40C0C000"/>
         <state state_pressed="true" backgroundColor="#4080C000"/>
@@ -524,8 +524,8 @@ OB        fontSize="10pt"
     <style id="RESIZER_HORIZONTAL"
         layoutWidth="FILL_PARENT"
         layoutHeight="WRAP_CONTENT"
-	minWidth="7"
-	maxWidth="7"
+	minWidth="7pt"
+	maxWidth="7pt"
 	backgroundColor="#E0E0E0">
         <state state_focused="true" backgroundColor="#40C0C000"/>
         <state state_pressed="true" backgroundColor="#4080C000"/>
diff --git a/views/standard_resources.list b/views/standard_resources.list
index c793bf17..f0b770c6 100644
--- a/views/standard_resources.list
+++ b/views/standard_resources.list
@@ -133,6 +133,8 @@ res/hdpi/hdpi_switch_on.png
 res/hdpi/hdpi_switch_on_disabled.png
 res/hdpi/hdpi_scrollbar_indicator_horizontal.png
 res/hdpi/hdpi_scrollbar_indicator_vertical.png
+res/hdpi/hdpi_find_case_sensitive.png
+res/hdpi/hdpi_find_whole_words.png
 res/mdpi/applications-internet.png
 res/mdpi/arrow_right_down_black.png
 res/mdpi/arrow_right_down_black_dark.png