update ui

digitalgust · Jun 15, 2024 · d4326a0 · d4326a0
1 parent 26894a0
commit d4326a0
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 6 deletions.
diff --git a/extlib/xgui/src/main/java/org/mini/gui/GListItem.java b/extlib/xgui/src/main/java/org/mini/gui/GListItem.java
@@ -6,6 +6,7 @@
 package org.mini.gui;
 
 import org.mini.glfm.Glfm;
+import org.mini.nanovg.Nanovg;
 
 import static org.mini.glwrap.GLUtil.toCstyleBytes;
 import static org.mini.gui.GToolkit.getStyle;
@@ -157,11 +158,17 @@ public boolean paint(long vg) {
         float tx, ty;
         tx = x + pad;
         ty = y + pad * .5f;
+        float tw = w - (pad * 2);
+        float th = list.list_item_heigh - pad;
+
+        nvgSave(vg);
+        Nanovg.nvgScissor(vg, tx, ty, tw, th);
+
 
         if (list.isSelected(getIndex())) {
-            GToolkit.drawRect(vg, tx, ty, w - (pad * 2), list.list_item_heigh - pad, GToolkit.getStyle().getSelectedColor());
+            GToolkit.drawRect(vg, tx, ty, tw, th, GToolkit.getStyle().getSelectedColor());
         } else {
-            GToolkit.drawRect(vg, tx, ty, w - (pad * 2), list.list_item_heigh - pad, GToolkit.getStyle().getUnselectedColor());
+            GToolkit.drawRect(vg, tx, ty, tw, th, GToolkit.getStyle().getUnselectedColor());
         }
         float[] c = outOfFilter ? GToolkit.getStyle().getHintFontColor() : enable ? getColor() : getDisabledColor();
 
@@ -189,6 +196,7 @@ public boolean paint(long vg) {
         }
         nvgFillColor(vg, c);
         GToolkit.drawTextLine(vg, tx + ((img == null && preicon_arr == null) ? 0 : thumb) + pad, ty + thumb / 2, getText(), list.getFontSize(), c, NVG_ALIGN_LEFT | NVG_ALIGN_MIDDLE);
+        Nanovg.nvgRestore(vg);
         return true;
     }
 

diff --git a/extlib/xgui/src/main/java/org/mini/gui/GObject.java b/extlib/xgui/src/main/java/org/mini/gui/GObject.java
@@ -748,7 +748,7 @@ public void setBgImg(GImage bgImg) {
         this.bgImg = bgImg;
     }
 
-    public void setBgimgAlpha(float bgImgAlpha) {
+    public void setBgImgAlpha(float bgImgAlpha) {
         this.bgImgAlpha = bgImgAlpha;
     }
 

diff --git a/extlib/xgui/src/main/java/org/mini/gui/GuiScriptLib.java b/extlib/xgui/src/main/java/org/mini/gui/GuiScriptLib.java
@@ -70,6 +70,7 @@ public GuiScriptLib(GForm form) {
             methodNames.put("deleteText".toLowerCase(), this::deleteText);//
             methodNames.put("getCaretPos".toLowerCase(), this::getCaretPos);//
             methodNames.put("showTitle".toLowerCase(), this::showTitle);//
+            methodNames.put("setBgImg".toLowerCase(), this::setBgImg);//
 
         }
     }
@@ -563,4 +564,19 @@ private DataType showTitle(ArrayList<DataType> para) {
         }
         return null;
     }
+
+    private DataType setBgImg(ArrayList<DataType> para) {
+        String compont = Interpreter.popBackStr(para);
+        GObject gobj = GToolkit.getComponent(form, compont);
+        if (gobj != null) {
+            String imgpath = Interpreter.popBackStr(para);
+            gobj.setBgImg(GToolkit.getCachedImageFromJar(imgpath));
+            if (!para.isEmpty()) {
+                String alphaStr = Interpreter.popBackStr(para);
+                float f = Float.parseFloat(alphaStr);
+                gobj.setBgImgAlpha(f);
+            }
+        }
+        return null;
+    }
 }
diff --git a/extlib/xgui/src/main/java/org/mini/layout/XFrame.java b/extlib/xgui/src/main/java/org/mini/layout/XFrame.java
@@ -118,9 +118,9 @@ protected void createAndSetGui() {
             frame.setOnCloseScript(onCloseScript);
             frame.setOnInitScript(onInitScript);
             frame.getTitlePanel().setBgImg(GToolkit.getCachedImageFromJar(titleBgPic));
-            frame.getTitlePanel().setBgimgAlpha(titleBgPicAlpha);
+            frame.getTitlePanel().setBgImgAlpha(titleBgPicAlpha);
             frame.getView().setBgImg(GToolkit.getCachedImageFromJar(viewBgPic));
-            frame.getView().setBgimgAlpha(viewBgPicAlpha);
+            frame.getView().setBgImgAlpha(viewBgPicAlpha);
             frame.setTitleShow(titleShow);
         } else {
             frame.setLocation(x, y);

diff --git a/extlib/xgui/src/main/java/org/mini/layout/XObject.java b/extlib/xgui/src/main/java/org/mini/layout/XObject.java
@@ -243,7 +243,7 @@ public final void initGuiMore() {
             if (bgPic != null) {
                 GImage img = GToolkit.getCachedImageFromJar(bgPic);
                 gui.setBgImg(img);
-                gui.setBgimgAlpha(bgPicAlpha);
+                gui.setBgImgAlpha(bgPicAlpha);
             }
 
             if (gui instanceof GContainer) {