Fixing up issues on elementary OS 7.1 with screenshots.

Author: Trevor Williams

com.github.phase1geo.annotator.yml

@@ -26,16 +26,6 @@ finish-args:
 # If we had external dependencies that weren't included in our SDK, we would list
 # them here.
 modules:
-  - name: libportal
-    buildsystem: meson
-    config-opts:
-      - "-Dbackends=['gtk4']"
-      - '-Ddocs=false'
-      - '-Dtests=false'
-    sources:
-      - type: git
-        url: https://github.com/flatpak/libportal.git
-        tag: "0.6"
   - name: annotator
     buildsystem: meson
     sources:

src/Application.vala

@@ -43,8 +43,6 @@ public class Annotator : Gtk.Application {
     Intl.bind_textdomain_codeset( GETTEXT_PACKAGE, "UTF-8" );
     Intl.textdomain( GETTEXT_PACKAGE );
 
-    stdout.printf( "CPE_NAME: %s\n", Environment.get_os_info( "CPE_NAME" ) );
-
     startup.connect( start_application );
     open.connect( open_files );
 

src/MainWindow.vala

@@ -567,13 +567,6 @@ public class MainWindow : Gtk.ApplicationWindow {
   // Returns the capture mode as determined by the user
   private void show_screenshot_popover( Widget parent ) {
 
-    var box = new Box( Orientation.VERTICAL, 10 ) {
-      margin_start  = 10,
-      margin_end    = 10,
-      margin_top    = 10,
-      margin_bottom = 10
-    };
-
     var shot_menu = new GLib.Menu();
 
     for( int i=0; i<CaptureType.NUM; i++ ) {
@@ -592,14 +585,18 @@ public class MainWindow : Gtk.ApplicationWindow {
       hexpand = true
     };
     var delay_sb = new SpinButton.with_range( 0, 6, 1 ) {
-      halign = Align.END
+      halign = Align.END,
+      valign = Align.CENTER
     };
     delay_sb.value = Annotator.settings.get_int( "screenshot-delay" );
     delay_sb.value_changed.connect(() => {
       Annotator.settings.set_int( "screenshot-delay", (int)delay_sb.value );
     });
 
-    var dbox = new Box( Orientation.HORIZONTAL, 10 );
+    var dbox = new Box( Orientation.HORIZONTAL, 10 ) {
+      margin_start = 10,
+      margin_end   = 10
+    };
     dbox.append( delay );
     dbox.append( delay_sb );
 
@@ -613,13 +610,18 @@ public class MainWindow : Gtk.ApplicationWindow {
     };
     var include_sw = new Switch() {
       halign = Align.END,
+      valign = Align.CENTER,
       active = Annotator.settings.get_boolean( "screenshot-include-win" )
     };
     include_sw.notify["active"].connect((value) => {
       Annotator.settings.set_boolean( "screenshot-include-win", include_sw.active );
     });
 
-    var ibox = new Box( Orientation.HORIZONTAL, 10 );
+    var ibox = new Box( Orientation.HORIZONTAL, 10 ) {
+      margin_top   = 10,
+      margin_start = 10,
+      margin_end   = 10
+    };
     ibox.append( include );
     ibox.append( include_sw );