diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2020-08-22 21:22:21 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2020-08-22 21:22:21 +0200 |
| commit | b8895cd64388230fb276d32761b39f0edd3a689b (patch) | |
| tree | 07f65a7ef910b50e9ada4b0f3728bd63130c9b25 /src | |
| parent | e784535afc164add324dd961e192eb8e7ee1deed (diff) | |
| parent | 0bb0910e8e7dfbc3a55ae89fc2544ce65e62a1d5 (diff) | |
Update upstream source from tag 'upstream/3.36.4'
Update to upstream version '3.36.4'
with Debian dir 4ea74992defe76f6b133c27dc7ad0163638f9191
Diffstat (limited to 'src')
| -rw-r--r-- | src/app-window.vala | 2 | ||||
| -rw-r--r-- | src/scanner.vala | 1 | ||||
| -rw-r--r-- | src/simple-scan.vala | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/app-window.vala b/src/app-window.vala index 446353d..30adac9 100644 --- a/src/app-window.vala +++ b/src/app-window.vala @@ -245,6 +245,7 @@ public class AppWindow : Gtk.ApplicationWindow private void update_scan_status () { + scan_button.set_sensitive(false); if (!have_devices) { status_primary_label.set_text (/* Label shown when searching for scanners */ @@ -254,6 +255,7 @@ public class AppWindow : Gtk.ApplicationWindow } else if (get_selected_device () != null) { + scan_button.set_sensitive(true); status_primary_label.set_text (/* Label shown when detected a scanner */ _("Ready to Scan")); status_secondary_label.set_text (get_selected_device_label ()); diff --git a/src/scanner.vala b/src/scanner.vala index 29c729b..dc58f14 100644 --- a/src/scanner.vala +++ b/src/scanner.vala @@ -1007,6 +1007,7 @@ public class Scanner : Object "24bit Color[Fast]", /* brother4 driver, Brother DCP-1622WE, #134 */ "24bit Color", /* Seen in the proprietary brother3 driver */ "24-bit Color", /* #161 Lexmark CX310dn */ + "24 bit Color", /* brscanads2200ads2700w */ "Color - 16 Million Colors" /* Samsung unified driver. LP: 892915 */ }; string[] gray_scan_modes = diff --git a/src/simple-scan.vala b/src/simple-scan.vala index fc9b101..771dc82 100644 --- a/src/simple-scan.vala +++ b/src/simple-scan.vala @@ -1536,7 +1536,8 @@ public class SimpleScan : Gtk.Application debug ("Requesting scan at %d dpi from device '%s'", options.dpi, device); if (!scanner.is_scanning ()) - append_page (options.paper_width, options.paper_height, options.dpi); + // We need to add +1 to avoid visual glitches, fixes: #179 + append_page (options.paper_width + 1, options.paper_height + 1, options.dpi + 1); scanner.scan (device, options); } |