Fix scale position at bottom of windows

aharotias2 · Jun 17, 2023 · 80f8194 · 80f8194
1 parent 894e15f
commit 80f8194
Show file tree

Hide file tree

Showing 13 changed files with 83 additions and 86 deletions.
diff --git a/src/Model/DualFileAccessor.vala b/src/Model/DualFileAccessor.vala
@@ -165,4 +165,3 @@ namespace ParaPara {
         }
     }
 }
-
diff --git a/src/Model/FileList.vala b/src/Model/FileList.vala
@@ -28,7 +28,7 @@ namespace ParaPara {
         public signal void terminated();
         public signal void directory_not_found();
         public signal void file_not_found();
-        
+
         public FileSystemNotifier notifier {
             get;
             private set;
@@ -38,7 +38,7 @@ namespace ParaPara {
             get;
             construct set;
         }
-        
+
         public bool closed {
             get;
             private set;
@@ -109,7 +109,7 @@ namespace ParaPara {
             notifier.watch.begin();
             debug("file list watching has been started!");
         }
-        
+
         public void close() {
             closed = true;
             notifier.quit();

diff --git a/src/Model/FileSystemNotifier.vala b/src/Model/FileSystemNotifier.vala
@@ -27,7 +27,7 @@ public class FileSystemNotifier : Object {
     public string directory_path { get; private set; }
     private bool loop_quit_flag;
     private int inotify_fd;
-    
+
     public FileSystemNotifier(string directory_path) {
         this.directory_path = directory_path;
         // inotify初期化
@@ -37,7 +37,7 @@ public class FileSystemNotifier : Object {
             return;
         }
     }
-    
+
     public async void watch() {
         // IOChannelの作成
         IOChannel inotify_channel = new IOChannel.unix_new(inotify_fd);
@@ -61,7 +61,7 @@ public class FileSystemNotifier : Object {
         });
 
         loop_quit_flag = false;
-        
+
         // inotifyイベントループを開始
         while (!loop_quit_flag) {
             // inotifyのウォッチ開始
@@ -77,11 +77,11 @@ public class FileSystemNotifier : Object {
         // inotifyのファイル記述子を閉じる。
         Posix.close(inotify_fd);
     }
-    
+
     public void quit() {
         loop_quit_flag = true;
     }
-    
+
     private void handle_event() {
         if (!FileUtils.test(directory_path, FileTest.EXISTS)) {
             debug("directory has been deleted!");

diff --git a/src/Model/SlideFileAccessor.vala b/src/Model/SlideFileAccessor.vala
@@ -25,7 +25,7 @@ namespace ParaPara {
             get;
             construct;
         }
-        
+
         public SortOrder sort_order {
             get;
             set;
@@ -63,4 +63,3 @@ namespace ParaPara {
         }
     }
 }
-
diff --git a/src/Model/ViewMode.vala b/src/Model/ViewMode.vala
@@ -24,4 +24,3 @@ namespace ParaPara {
         SINGLE_VIEW_MODE, SLIDE_VIEW_MODE, DUAL_VIEW_MODE
     }
 }
-
diff --git a/src/Utils/FileUtils.vala b/src/Utils/FileUtils.vala
@@ -53,4 +53,3 @@ namespace ParaPara {
         }
     }
 }
-
diff --git a/src/Utils/inotify-utils.c b/src/Utils/inotify-utils.c
@@ -10,24 +10,24 @@ int read_inotify_event(int fd, GeeQueue* queue) {
 
     // ファイル記述子から読み込んでバッファにデータを写す
     int r = read(fd, buffer, 30000);
-    InotifyEvent* pevent;  
+    InotifyEvent* pevent;
 
     while (buffer_i < r) {
         // バッファからinotify_event構造体を読み出す。
         InotifyEvent* pevent = (InotifyEvent*) &buffer[buffer_i];
-        
+
         // inotify_event構造体のサイズは16 + lenフィールドの値
         int event_size = sizeof(InotifyEvent) + pevent->len;
-        
+
         // キューに入れるため、メモリを確保する
         InotifyEvent* event = malloc(event_size);
-        
+
         // inotify_event構造体をコピーする
         memmove(event, pevent, event_size);
-        
+
         // コピーしたinotify_event構造体へのポインタをキューに入れる
         gee_queue_offer(queue, event);
-        
+
         // イベントを最後まで読み込む
         buffer_i += event_size;
     }

diff --git a/src/Widgets/Image.vala b/src/Widgets/Image.vala
@@ -32,22 +32,22 @@ namespace ParaPara {
             get;
             set;
         }
-        
+
         public File? fileref {
             get;
             set;
         }
-        
+
         public bool fit {
             get;
             set;
         }
-        
+
         public bool is_animation {
             get;
             private set;
         }
-        
+
         public bool paused {
             get {
                 return paused_value;
@@ -60,7 +60,7 @@ namespace ParaPara {
         }
 
         private ViewMode _view_mode;
-        
+
         public ViewMode view_mode {
             get {
                 return _view_mode;
@@ -75,24 +75,24 @@ namespace ParaPara {
                 return zoom_percent / 10.0;
             }
         }
-        
+
         public int original_height {
             get {
                 return original_pixbuf.height;
             }
         }
-        
+
         public int original_width {
             get {
                 return original_pixbuf.width;
             }
         }
-        
+
         public bool has_image {
             get;
             set;
         }
-        
+
         public Pixbuf? original_pixbuf {
             get;
             private set;

diff --git a/src/Widgets/ImageView.vala b/src/Widgets/ImageView.vala
@@ -33,34 +33,34 @@ namespace ParaPara {
             get;
             construct;
         }
-        
+
         public abstract ParaPara.Window main_window {
             get;
             construct;
         }
-        
+
         public abstract FileList file_list {
             get;
             set;
         }
-        
+
         public abstract bool controllable {
             get;
             set;
         }
-        
+
         public abstract string dir_path {
             owned get;
         }
-        
+
         public abstract bool has_image {
             get;
         }
-        
+
         public abstract double position {
             get;
         }
-        
+
         public abstract int index {
             get;
         }

diff --git a/src/Widgets/ResizeDialog.vala b/src/Widgets/ResizeDialog.vala
@@ -32,7 +32,7 @@ namespace ParaPara {
             construct set;
             get;
         }
-        
+
         public int original_height {
             construct set;
             get;

diff --git a/src/Widgets/SingleImageView.vala b/src/Widgets/SingleImageView.vala
@@ -27,50 +27,50 @@ namespace ParaPara {
             get;
             construct;
         }
-        
+
         public Overlay overlay {
             get;
             private set;
         }
-        
+
         public Image image {
             get;
             private set;
         }
-        
+
         public ScrolledWindow scrolled {
             get;
             private set;
         }
-        
+
         public Label error_message {
             get;
             private set;
         }
-        
+
         public ViewMode view_mode {
             get;
             construct;
         }
-        
+
         public bool controllable {
             get;
             set;
             default = true;
         }
-        
+
         public bool has_image {
             get {
                 return image.has_image;
             }
         }
-        
+
         public int index {
             get {
                 return accessor.get_index();
             }
         }
-        
+
         public double position {
             get {
                 return (double) accessor.get_index() / (double) _file_list.size;