Fix filter panel keyboard position/size edit text box value limits

diff --git a/include/options.h b/include/options.h
index 26e24a28c68316581309e51fa76d504a7938e7cd..5452f854c8f798007bacc87f2374966ba4b53431 100644 (file)
--- a/include/options.h
+++ b/include/options.h
@@ -278,6 +278,7 @@ enum { CP_GENERIC = 1, CP_CDTV, CP_CDTVCR, CP_CD32, CP_A500, CP_A500P, CP_A600,
 
 #define MANUAL_SCALE_MIN_RANGE -1999
 #define MANUAL_SCALE_MAX_RANGE 1999
+#define MANUAL_FILTER_MAX_RANGE 9999
 
 #define MONITOREMU_NONE 0
 #define MONITOREMU_AUTO 1

diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp
index f95390145507727230547d95934b97fc2bcd5076..600af07b04f7127cc9935dccf142160e8dc4e735 100644 (file)
--- a/od-win32/win32gui.cpp
+++ b/od-win32/win32gui.cpp
@@ -20718,8 +20718,8 @@ static void values_to_hw3ddlg (HWND hDlg, bool initdialog)
                yrange1 = xrange1;
                yrange2 = xrange2;
        } else {
-               xrange1 = -9999;
-               xrange2 = 9999;
+               xrange1 = -MANUAL_FILTER_MAX_RANGE;
+               xrange2 = MANUAL_FILTER_MAX_RANGE;
                yrange1 = xrange1;
                yrange2 = xrange2;
        }
@@ -21324,41 +21324,7 @@ static INT_PTR CALLBACK hw3dDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPARAM
                        struct gfx_filterdata *fd = &currprefs.gf[filter_nativertg];
                        int val;
 
-                       if (fdwp->gfx_filter_autoscale == AUTOSCALE_MANUAL) {
-                               if (h == hz && getdlgnumber(hz, &val, -1, 1900)) {
-                                       currprefs.gfx_xcenter_size = workprefs.gfx_xcenter_size = val;
-                                       xSendDlgItemMessage(hDlg, IDC_FILTERHZ, TBM_SETPOS, TRUE, val);
-                               }
-                               if (h == vz && getdlgnumber(vz, &val, -1, 1900)) {
-                                       currprefs.gfx_xcenter_size = workprefs.gfx_xcenter_size = val;
-                                       xSendDlgItemMessage(hDlg, IDC_FILTERVZV, TBM_SETPOS, TRUE, val);
-                               }
-                               if (h == ho && getdlgnumber(ho, &val, -1, 700)) {
-                                       currprefs.gfx_xcenter_size = workprefs.gfx_xcenter_size = val;
-                                       xSendDlgItemMessage(hDlg, IDC_FILTERHOV, TBM_SETPOS, TRUE, val);
-                               }
-                               if (h == vo && getdlgnumber(vo, &val, -1, 700)) {
-                                       currprefs.gfx_xcenter_size = workprefs.gfx_xcenter_size = val;
-                                       xSendDlgItemMessage(hDlg, IDC_FILTERVOV, TBM_SETPOS, TRUE, val);
-                               }
-                       } else if (fdwp->gfx_filter_autoscale == AUTOSCALE_OVERSCAN_BLANK) {
-                               if (h == hz && getdlgnumber(hz, &val, -1, 1900)) {
-                                       fd->gfx_filter_left_border = fdwp->gfx_filter_left_border = val;
-                                       xSendDlgItemMessage(hDlg, IDC_FILTERHZ, TBM_SETPOS, TRUE, val);
-                               }
-                               if (h == vz && getdlgnumber(vz, &val, 0, 1900)) {
-                                       fd->gfx_filter_right_border = fdwp->gfx_filter_right_border = val;
-                                       xSendDlgItemMessage(hDlg, IDC_FILTERVZV, TBM_SETPOS, TRUE, val);
-                               }
-                               if (h == vo && getdlgnumber(vo, &val, -1, 700)) {
-                                       fd->gfx_filter_top_border = fdwp->gfx_filter_top_border = val;
-                                       xSendDlgItemMessage(hDlg, IDC_FILTERHOV, TBM_SETPOS, TRUE, val);
-                               }
-                               if (h == vo && getdlgnumber(vo, &val, 0, 700)) {
-                                       fd->gfx_filter_bottom_border = fdwp->gfx_filter_bottom_border = val;
-                                       xSendDlgItemMessage(hDlg, IDC_FILTERVOV, TBM_SETPOS, TRUE, val);
-                               }
-                       } else {
+                       if (fdwp->gfx_filter_autoscale == AUTOSCALE_INTEGER || fdwp->gfx_filter_autoscale == AUTOSCALE_INTEGER_AUTOSCALE) {
                                if (h == hz) {
                                        if (getdlgnumber(hz, &val, -99, 99)) {
                                                fd->gfx_filter_horiz_zoom = (float)val;
@@ -21390,6 +21356,46 @@ static INT_PTR CALLBACK hw3dDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPARAM
                                }
                                fd->gfx_filter_horiz_offset = fdwp->gfx_filter_horiz_offset;
                                fd->gfx_filter_vert_offset = fdwp->gfx_filter_vert_offset;
+                       } else if (fdwp->gfx_filter_autoscale == AUTOSCALE_OVERSCAN_BLANK) {
+                               if (h == hz && getdlgnumber(hz, &val, -1, MANUAL_SCALE_MAX_RANGE - 1)) {
+                                       fd->gfx_filter_left_border = fdwp->gfx_filter_left_border = val;
+                                       xSendDlgItemMessage(hDlg, IDC_FILTERHZ, TBM_SETPOS, TRUE, val);
+                               }
+                               if (h == vz && getdlgnumber(vz, &val, 0, MANUAL_SCALE_MAX_RANGE - 1)) {
+                                       fd->gfx_filter_right_border = fdwp->gfx_filter_right_border = val;
+                                       xSendDlgItemMessage(hDlg, IDC_FILTERVZV, TBM_SETPOS, TRUE, val);
+                               }
+                               if (h == ho && getdlgnumber(ho, &val, -1, 700)) {
+                                       fd->gfx_filter_top_border = fdwp->gfx_filter_top_border = val;
+                                       xSendDlgItemMessage(hDlg, IDC_FILTERHOV, TBM_SETPOS, TRUE, val);
+                               }
+                               if (h == vo && getdlgnumber(vo, &val, 0, 700)) {
+                                       fd->gfx_filter_bottom_border = fdwp->gfx_filter_bottom_border = val;
+                                       xSendDlgItemMessage(hDlg, IDC_FILTERVOV, TBM_SETPOS, TRUE, val);
+                               }
+                       } else {
+                               int maxh = MANUAL_FILTER_MAX_RANGE;
+                               int minh = -MANUAL_FILTER_MAX_RANGE;
+                               if (fdwp->gfx_filter_autoscale == AUTOSCALE_MANUAL) {
+                                       maxh = MANUAL_SCALE_MAX_RANGE;
+                                       minh = -MANUAL_SCALE_MAX_RANGE;
+                               }
+                               if (h == hz && getdlgnumber(hz, &val, minh, maxh)) {
+                                       currprefs.gfx_xcenter_size = workprefs.gfx_xcenter_size = val;
+                                       xSendDlgItemMessage(hDlg, IDC_FILTERHZ, TBM_SETPOS, TRUE, val);
+                               }
+                               if (h == vz && getdlgnumber(vz, &val, minh, maxh)) {
+                                       currprefs.gfx_xcenter_size = workprefs.gfx_xcenter_size = val;
+                                       xSendDlgItemMessage(hDlg, IDC_FILTERVZV, TBM_SETPOS, TRUE, val);
+                               }
+                               if (h == ho && getdlgnumber(ho, &val, minh, maxh)) {
+                                       currprefs.gfx_xcenter_size = workprefs.gfx_xcenter_size = val;
+                                       xSendDlgItemMessage(hDlg, IDC_FILTERHOV, TBM_SETPOS, TRUE, val);
+                               }
+                               if (h == vo && getdlgnumber(vo, &val, minh, maxh)) {
+                                       currprefs.gfx_xcenter_size = workprefs.gfx_xcenter_size = val;
+                                       xSendDlgItemMessage(hDlg, IDC_FILTERVOV, TBM_SETPOS, TRUE, val);
+                               }
                        }
                        if (!full_property_sheet) {
                                init_colors(0);