Prep for GUI refresh?

Author: techguy16

api

@@ -1,5 +1,13 @@
 #!/bin/bash
 
+if [[ $(xrandr --current) =~ "connected primary" ]]; then
+    resolution=$(xrandr --current | grep " connected primary" | awk '{print $4}' | cut -d'+' -f1)
+else
+    resolution=$(xrandr --current | grep " connected" | awk '{print $3}' | cut -d'+' -f1)
+fi
+
+horizontal=$(echo $resolution | cut -d'x' -f1)
+vertical=$(echo $resolution | cut -d'x' -f2)
 
 theme_get() {
     website_file="etc/theme"
@@ -116,6 +124,9 @@ uninstall_app() {
 
 # Function to search for apps
 search_apps() {
+    x2=$((horizontal / 2 - 65))
+    y2=$((vertical / 2 - 320))
+
     query=$(GTK_THEME="${theme}" yad --title="Search Apps" --borders=10 --center --text="Enter query:" --entry \
             --button="Cancel!gtk-cancel":1 --button="Search!edit-find":0)
     if [ -n "$query" ]; then
@@ -136,15 +147,16 @@ search_apps() {
         done
 
         if [ ${#apps_found[@]} -gt 0 ]; then
-            selected_category2=$(GTK_THEME="${theme}" yad --center --title="Search Results" --width=400 --height=300 \
-            --list --text="<big><b>Search Results for '${query}'</b></big>" --column="Icon:IMG" --column="App Name" --column="in" --column="Category" --no-headers "${apps_found[@]}" --borders=10 --button="Exit!gtk-cancel":1 --button="View App!edit-find":0)
+            selected_category2=$(GTK_THEME="${theme}" yad --center --title="Search Results" --geometry=450x600+${x2}+${y2} \
+            --list --text="<big><b>Search Results for '${query}'</b></big>" --column="Icon:IMG" --column="App Name" \
+            --column="in" --column="Category" --no-headers "${apps_found[@]}" --button="Exit!gtk-cancel":1 --button="View App!edit-find":0 &)
             if [ -n "$selected_category2" ]; then
                 echo "$(echo ${selected_category2} | awk -F"|" '{print $2}' | sed 's/|//g')" > /tmp/tmpname
-                ./gui showdetails
+                ./gui showdetails &
             fi
         else
-            GTK_THEME="${theme}" yad --center --title="Search Results" --width=300 --height=100 \
-            --text="<big><b>No apps found for '${query}'.</b></big>\nPlease try another query." --borders=10 --center \
+            GTK_THEME="${theme}" yad --center --title="Search Results" --geometry=450x600+${x2}+${y2} \
+            --text="<big><b>No apps found for '${query}'.</b></big>\nPlease try another query." --center \
             --button="Retry!edit-find":1 --button="Exit!gtk-cancel":0
             response=$?
             if [ $response -eq 1 ]; then

apps/way11/install

@@ -4,6 +4,7 @@ VERSION="02a5fddf88669d7e513527d9b336df54853d9bbc"
 sudo apt update
 sudo apt install weston yad wmctrl x11-utils -y
 
+rm -rf "$HOME/.techguy16/way11"
 git clone https://github.com/techguy16/way11 "$HOME/.techguy16/way11"
 chmod +x "$HOME/.techguy16/way11/way11"
 chmod +x "$HOME/.techguy16/way11/way11-gui"

gui

@@ -273,7 +273,7 @@ app_details_page() {
         GDK_BACKEND=x11 $YAD_COMMAND --class LinStore --title="App Details" --geometry=450x${APP_STORE_HEIGHT}+${x2}+${categoryPosY} --form --class="LinStore" \
             --text "<big>${displayName}</big>\nBy <b>${creator}</b> (<a href='${website}'>App Website</a>)\n${donate}" \
             --field="<b>Description</b>:TXT" --no-edit "$description" --image="$app_icon" --window-icon="images/logo/logo-64.png" --image-on-top \
-            --button="$buttonText!$buttonImage:$buttonCommand" "${buttons[@]}" --skip-taskbar --noclose
+            --button="$buttonText!$buttonImage:$buttonCommand" "${buttons[@]}" --skip-taskbar --noclose &
     )
 
     rm -f /tmp/description.tmp
@@ -316,7 +316,7 @@ show_apps_in_category() {
         GTK_THEME="${theme}" GDK_BACKEND=x11 $YAD_COMMAND --text "<big><b>$title</b></big>" --geometry=${APP_STORE_WIDTH}x${APP_STORE_HEIGHT}+${categoryPos}+${categoryPosY} --center --columns="2" \
                 --list --image="images/logo/logo-64.png" --window-icon="images/logo/logo-64.png" --image-on-top --title "LinStore" --column "Icon:IMG" --column "Apps" --class="LinStore" \
                 --button="Back"!images/button/back.png!:4 --separator="\n" --markup "${formatted_apps[@]}" --no-headers \
-                --css="span{fgcolor:green;}" --select-action='bash -c "./gui showdetails \"%s\""'#> /dev/null 2>&1
+                --css="span{fgcolor:green;}" --select-action='bash -c "./gui showdetails \"%s\"" &'#> /dev/null 2>&1
 
         button_clicked=$?
         if [ $button_clicked -eq 4 ]; then
@@ -351,9 +351,13 @@ show_app_store() {
 
     # Search function
 
-    selected_category_raw=$(GTK_THEME="${theme}" GDK_BACKEND=x11 $YAD_COMMAND --text "$random_announcement" --geometry=${APP_STORE_WIDTH}x${APP_STORE_HEIGHT}+${categoryPos}+${categoryPosY} --center --columns="3" \
+    selected_category_raw=$(GTK_THEME="${theme}" GDK_BACKEND=x11 $YAD_COMMAND --text "$random_announcement" \
+        --geometry=${APP_STORE_WIDTH}x${APP_STORE_HEIGHT}+${categoryPos}+${categoryPosY} --center --columns="3" \
         "${list_items[@]}" --class="LinStore" \
-        --list --image="images/logo/logo-64.png" --window-icon="images/logo/logo-64.png" --image-on-top --title "$APP_STORE_NAME" --column "Icon:IMG" --column "Category" --button "!images/button/search.png"!"Search":"bash -c './api search'" --button "!images/button/update.png"!"Updates":"bash -c './update'" --button "!images/button/settings.png"!"Settings":"bash -c './settings'" --no-headers --item-height="$welcome_height" --timeout=0 --no-close)
+        --list --image="images/logo/logo-64.png" --window-icon="images/logo/logo-64.png" --image-on-top --title "$APP_STORE_NAME" --column "Icon:IMG" \
+        --column "Category" --button "!images/button/search.png"!"Search":"bash -c './api search' &" \
+        --button "!images/button/update.png"!"Updates":"bash -c './update' &" --button "!images/button/settings.png"!"Settings":"bash -c './settings' &" \
+        --no-headers --item-height="$welcome_height" --timeout=0 --no-close)
     exval=$?
     ./api info "Exit value: ${exval}"
     selected_category="${selected_category_raw//|/}"
@@ -365,7 +369,7 @@ show_app_store() {
     elif [ "$exval" -eq "252" ]; then
         pkill -f "yad*" > /dev/null 2>&1
     elif [ -n "$selected_category" ]; then
-        show_apps_in_category "$selected_category"
+        show_apps_in_category "$selected_category" &
     fi
 }
 

update

@@ -114,7 +114,7 @@ check_for_updates() {
     else
         kill $(pgrep -f "title=App Details") > /dev/null 2>&1
         updates_list=$(GDK_BACKEND=x11 yad --list --class="LinStore" --title="LinStore Updates" --column="Select":CHK --column="Icon":IMG --column="App" \
-            "${updates[@]}" --checklist --geometry=450x600+${x2}+${y2} --hide-header "${buttons[@]}")
+            "${updates[@]}" --checklist --geometry=450x600+${x2}+${y2} --no-header "${buttons[@]}") #i regret programming
         response=$?
     fi