From cb1910125ed4efa25ef807fed8f75991f2c0fad2 Mon Sep 17 00:00:00 2001
From: daleclack <daleclack1@foxmail.com>
Date: Sat, 27 Nov 2021 13:39:37 +0800
Subject: [PATCH] Update gtk118

---
 Gtk4/gtk118_imageviewer/src/MyImage.cpp  |   6 ++++-
 Gtk4/gtk118_imageviewer/src/MyWindow.cpp |  33 +++++++++++++++++++++--
 Gtk4/icon.ico                            | Bin 0 -> 9662 bytes
 Gtk4/icon.rc                             |   1 +
 rust_test/test.rs                        |   3 +++
 5 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 Gtk4/icon.ico
 create mode 100644 Gtk4/icon.rc
 create mode 100644 rust_test/test.rs

diff --git a/Gtk4/gtk118_imageviewer/src/MyImage.cpp b/Gtk4/gtk118_imageviewer/src/MyImage.cpp
index 4fe6209..d02719c 100644
--- a/Gtk4/gtk118_imageviewer/src/MyImage.cpp
+++ b/Gtk4/gtk118_imageviewer/src/MyImage.cpp
@@ -25,8 +25,9 @@ struct _MyImageClass{
 G_DEFINE_TYPE(MyImage,my_image,GTK_TYPE_WIDGET)
 
 void my_image_set_pixbuf(MyImage * self, GdkPixbuf * pixbuf){
-    //g_clear_object(&self->paintable);
+    g_clear_object(&self->paintable);
     self->paintable = (GdkPaintable*)gdk_texture_new_for_pixbuf(pixbuf);
+    gtk_widget_queue_draw(GTK_WIDGET(self));
 }
 
 static void pressed_cb(GtkGestureClick * gesture,int n_press,double x,double y,MyImage * self){
@@ -39,6 +40,7 @@ static void pressed_cb(GtkGestureClick * gesture,int n_press,double x,double y,M
 
 static void drag_start(GtkGestureDrag * self,double x,double y,MyImage * image){
     //Get Properties
+    //sleep(1);
     image->start_x = x;
     image->start_y = y;
     image->hmax_value = gtk_adjustment_get_upper(image->hadjustment);
@@ -47,6 +49,7 @@ static void drag_start(GtkGestureDrag * self,double x,double y,MyImage * image){
 
 static void drag_update(GtkGestureDrag * self,double x,double y,MyImage * image){
     //Move Image
+    //sleep(1);
     int hadj_value = gtk_adjustment_get_value(image->hadjustment);
     int vadj_value = gtk_adjustment_get_value(image->vadjustment);
     if(hadj_value - x >= 0 &&  - x <= image->hmax_value){
@@ -59,6 +62,7 @@ static void drag_update(GtkGestureDrag * self,double x,double y,MyImage * image)
 
 static void drag_end(GtkGestureDrag * self,double x,double y,MyImage * image){
     //g_print("%f %f\n",x+image->start_x,y+image->start_y);
+    //sleep(1);
     int hadj_value = gtk_adjustment_get_value(image->hadjustment);
     int vadj_value = gtk_adjustment_get_value(image->vadjustment);
     if(hadj_value - x >= 0 &&  - x <= image->hmax_value){
diff --git a/Gtk4/gtk118_imageviewer/src/MyWindow.cpp b/Gtk4/gtk118_imageviewer/src/MyWindow.cpp
index 24877b5..4a504b9 100644
--- a/Gtk4/gtk118_imageviewer/src/MyWindow.cpp
+++ b/Gtk4/gtk118_imageviewer/src/MyWindow.cpp
@@ -9,9 +9,37 @@ struct _MyWindow{
 
 G_DEFINE_TYPE(MyWindow,my_window,GTK_TYPE_APPLICATION_WINDOW)
 
-static void dialog_respone(GtkNativeDialog * dialog,int respone,MyWindow * window){}
+static void dialog_respone(GtkNativeDialog * dialog,int response,MyWindow * window){
+    if(response == GTK_RESPONSE_ACCEPT){
+        //Get Filename
+        GFile * file = gtk_file_chooser_get_file(GTK_FILE_CHOOSER(dialog));
+        char * filename = g_file_get_path(file);
 
-static void openfile_dialog(GtkWidget * widget,MyWindow * window){}
+        GError * err = NULL;
+        GdkPixbuf * pixbuf = gdk_pixbuf_new_from_file(filename,&err);
+        if(err!=NULL){
+            fprintf(stderr, "Unable to read file: %s\n", err->message);
+            g_error_free(err);
+        }else{
+            my_image_set_pixbuf(MY_IMAGE(window->img_view),pixbuf);
+        }
+
+        g_object_unref(file);
+        g_free(filename);
+    }
+    gtk_native_dialog_destroy(dialog);
+}
+
+static void openfile_dialog(GtkWidget * widget,MyWindow * window){
+    //Create a dialog
+    GtkFileChooserNative * dialog = gtk_file_chooser_native_new("Open Image File",GTK_WINDOW(window),
+                                    GTK_FILE_CHOOSER_ACTION_OPEN,"OK","Cancel");
+
+    //Link the "response" signal of dialog
+    g_signal_connect(dialog,"response",G_CALLBACK(dialog_respone),window);
+
+    gtk_native_dialog_show(GTK_NATIVE_DIALOG(dialog));
+}
 
 static void my_window_init(MyWindow * window){
     GtkWidget * vbox, * sw, * scale, * btnbox, * btnopen;
@@ -42,6 +70,7 @@ static void my_window_init(MyWindow * window){
 
     //Add a button
     btnopen = gtk_button_new_with_label("Open Image");
+    g_signal_connect(btnopen,"clicked",G_CALLBACK(openfile_dialog),window);
     gtk_box_append(GTK_BOX(btnbox),btnopen);
     gtk_box_append(GTK_BOX(vbox),btnbox);
 
diff --git a/Gtk4/icon.ico b/Gtk4/icon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..006512f3fd445a0b86e3650dbf20c8c357c75360
GIT binary patch
literal 9662
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

literal 0
HcmV?d00001

diff --git a/Gtk4/icon.rc b/Gtk4/icon.rc
new file mode 100644
index 0000000..b0c9c68
--- /dev/null
+++ b/Gtk4/icon.rc
@@ -0,0 +1 @@
+MAINICON ICON "Icon.ico"
diff --git a/rust_test/test.rs b/rust_test/test.rs
new file mode 100644
index 0000000..f7b4975
--- /dev/null
+++ b/rust_test/test.rs
@@ -0,0 +1,3 @@
+fn main(){
+    println!("Hello World");
+}
\ No newline at end of file