Usermode/AxWin3 - A couple more icons, render fixes

diff --git a/Usermode/Applications/axwin3_src/WM/Makefile b/Usermode/Applications/axwin3_src/WM/Makefile
index 4150e94..3bc24f8 100644 (file)
--- a/Usermode/Applications/axwin3_src/WM/Makefile
+++ b/Usermode/Applications/axwin3_src/WM/Makefile
@@ -23,7 +23,7 @@ OBJ += renderers/widget/textinput.o
 OBJ += renderers/widget/spacer.o
 OBJ += renderers/widget/subwin.o
 
-PNGIMAGES := toolbar_new.png
+PNGIMAGES := toolbar_new.png toolbar_save.png toolbar_open.png
 
 LDFLAGS += -limage_sif -luri -lnet -lunicode
 
@@ -45,9 +45,14 @@ install: install_resources
 $(IMG2SIF):
        $(MAKE) -C $(dir $(IMG2SIF)) img2sif
 
-install_%.sif: resources/%.png
+all: $(addprefix resources/,$(PNGIMAGES:%.png=.%.sif))
+
+resources/.%.sif: $(IMG2SIF) Makefile resources/%.png
        @echo img2sif resources/$*.png
-       @$(IMG2SIF) resources/$*.png resources/.$*.sif
-       @$(xCP) resources/.$*.sif $(DISTROOT)/$(DIR)/$*.sif
+       @$(IMG2SIF) --rle1x32 resources/$*.png resources/.$*.sif
+
+install_%.sif: resources/.%.sif ;
+       @echo [xCP] $(DISTROOT)/$(DIR)/$*.sif
+       @$(xCP) $< $(DISTROOT)/$(DIR)/$*.sif
 
 install_resources: $(IMG2SIF) $(addprefix install_,$(PNGIMAGES:%.png=%.sif))

diff --git a/Usermode/Applications/axwin3_src/WM/renderers/widget/spacer.c b/Usermode/Applications/axwin3_src/WM/renderers/widget/spacer.c
index 54f2029..028ed61 100644 (file)
--- a/Usermode/Applications/axwin3_src/WM/renderers/widget/spacer.c
+++ b/Usermode/Applications/axwin3_src/WM/renderers/widget/spacer.c
@@ -40,8 +40,8 @@ void Widget_Spacer_Render(tWindow *Window, tElement *Element)
 
 void Widget_Spacer_Init(tElement *Element)
 {
-       Element->MinH = SPACER_RULE_SIZE+1;
-       Element->MinW = SPACER_RULE_SIZE+1;
+       Element->MinH = SPACER_RULE_SIZE+2;
+       Element->MinW = SPACER_RULE_SIZE+2;
 }
 
 DEFWIDGETTYPE(ELETYPE_SPACER,

diff --git a/Usermode/Applications/axwin3_src/WM/resources/toolbar_open.png b/Usermode/Applications/axwin3_src/WM/resources/toolbar_open.png
new file mode 100755 (executable)
index 0000000..b3289a8
Binary files /dev/null and b/Usermode/Applications/axwin3_src/WM/resources/toolbar_open.png differ

diff --git a/Usermode/Applications/axwin3_src/WM/resources/toolbar_save.png b/Usermode/Applications/axwin3_src/WM/resources/toolbar_save.png
new file mode 100755 (executable)
index 0000000..9d561d2
Binary files /dev/null and b/Usermode/Applications/axwin3_src/WM/resources/toolbar_save.png differ

diff --git a/Usermode/Applications/gui_ate_src/main.c b/Usermode/Applications/gui_ate_src/main.c
index a6bbee6..a3c452b 100644 (file)
--- a/Usermode/Applications/gui_ate_src/main.c
+++ b/Usermode/Applications/gui_ate_src/main.c
@@ -77,7 +77,7 @@ int main(int argc, char *argv[])
        // <testing>
        AxWin3_RichText_SetLineCount(gMainWindow_TextArea, 3);
        AxWin3_RichText_SendLine(gMainWindow_TextArea, 0, "First line!");
-       AxWin3_RichText_SendLine(gMainWindow_TextArea, 2, "Third line! \x01""ff0000A red");
+       AxWin3_RichText_SendLine(gMainWindow_TextArea, 2, "Third line! \x01""ff0000red\x01""00ff00green");
        // </testing>
 
        AxWin3_ShowWindow(gMainWindow_TextArea, 1);

diff --git a/Usermode/Applications/gui_ate_src/strings.c b/Usermode/Applications/gui_ate_src/strings.c
index 96b6c0e..f5dea51 100644 (file)
--- a/Usermode/Applications/gui_ate_src/strings.c
+++ b/Usermode/Applications/gui_ate_src/strings.c
@@ -29,7 +29,9 @@ const struct keyval_str       gaDisplayStrings[] = {
        };
 const int      ciNumDisplayStrings = sizeof(gaDisplayStrings)/sizeof(gaDisplayStrings[0]);
 const struct keyval_str        gaImageStrings[] = {
-       {"BtnNew", "file:///Acess/Apps/AxWin/3.0/toolbar_new.sif"}
+       {"BtnNew", "file:///Acess/Apps/AxWin/3.0/toolbar_new.sif"},
+       {"BtnOpen", "file:///Acess/Apps/AxWin/3.0/toolbar_open.sif"},
+       {"BtnSave", "file:///Acess/Apps/AxWin/3.0/toolbar_save.sif"}
        };
 const int      ciNumImageStrings = sizeof(gaImageStrings)/sizeof(gaImageStrings[0]);