From 47dc046b1ed8926267561d105b711998319c8761 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Thu, 15 Jun 2017 10:21:54 -0700 Subject: [PATCH] Simplify zoom conversion code so there is no need to "shut up compilers" --- src/gtk/webview_webkit.cpp | 15 ++++----------- src/gtk/webview_webkit2.cpp | 15 ++++----------- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/src/gtk/webview_webkit.cpp b/src/gtk/webview_webkit.cpp index ac2159811f..68f0b8d5d4 100644 --- a/src/gtk/webview_webkit.cpp +++ b/src/gtk/webview_webkit.cpp @@ -747,26 +747,19 @@ wxWebViewZoom wxWebViewWebKit::GetZoom() const { return wxWEBVIEW_ZOOM_TINY; } - else if (zoom > 0.65 && zoom <= 0.90) + if (zoom <= 0.90) { return wxWEBVIEW_ZOOM_SMALL; } - else if (zoom > 0.90 && zoom <= 1.15) + if (zoom <= 1.15) { return wxWEBVIEW_ZOOM_MEDIUM; } - else if (zoom > 1.15 && zoom <= 1.45) + if (zoom <= 1.45) { return wxWEBVIEW_ZOOM_LARGE; } - else if (zoom > 1.45) - { - return wxWEBVIEW_ZOOM_LARGEST; - } - - // to shut up compilers, this can never be reached logically - wxFAIL; - return wxWEBVIEW_ZOOM_MEDIUM; + return wxWEBVIEW_ZOOM_LARGEST; } diff --git a/src/gtk/webview_webkit2.cpp b/src/gtk/webview_webkit2.cpp index 3122d8b47f..e2b0c3047a 100644 --- a/src/gtk/webview_webkit2.cpp +++ b/src/gtk/webview_webkit2.cpp @@ -855,26 +855,19 @@ wxWebViewZoom wxWebViewWebKit::GetZoom() const { return wxWEBVIEW_ZOOM_TINY; } - else if (zoom > 0.65 && zoom <= 0.90) + if (zoom <= 0.90) { return wxWEBVIEW_ZOOM_SMALL; } - else if (zoom > 0.90 && zoom <= 1.15) + if (zoom <= 1.15) { return wxWEBVIEW_ZOOM_MEDIUM; } - else if (zoom > 1.15 && zoom <= 1.45) + if (zoom <= 1.45) { return wxWEBVIEW_ZOOM_LARGE; } - else if (zoom > 1.45) - { - return wxWEBVIEW_ZOOM_LARGEST; - } - - // to shut up compilers, this can never be reached logically - wxFAIL; - return wxWEBVIEW_ZOOM_MEDIUM; + return wxWEBVIEW_ZOOM_LARGEST; }