From 307fe912f47d53f040fa0ee1536040a20f4d40d9 Mon Sep 17 00:00:00 2001 From: Marc Bernard <59966492+mbtools@users.noreply.github.com> Date: Fri, 27 Oct 2023 02:22:49 -0400 Subject: [PATCH] Add comments explaining "icon scaling" (#6583) Co-authored-by: Lars Hvam --- src/ui/core/zcl_abapgit_html.clas.abap | 4 +- src/ui/lib/zcl_abapgit_gui_page.clas.abap | 73 ++++++++++++----------- 2 files changed, 40 insertions(+), 37 deletions(-) diff --git a/src/ui/core/zcl_abapgit_html.clas.abap b/src/ui/core/zcl_abapgit_html.clas.abap index 4966010c9..d27811201 100644 --- a/src/ui/core/zcl_abapgit_html.clas.abap +++ b/src/ui/core/zcl_abapgit_html.clas.abap @@ -75,7 +75,7 @@ ENDCLASS. -CLASS ZCL_ABAPGIT_HTML IMPLEMENTATION. +CLASS zcl_abapgit_html IMPLEMENTATION. METHOD checkbox. @@ -148,6 +148,8 @@ CLASS ZCL_ABAPGIT_HTML IMPLEMENTATION. lv_color = | { lv_color }|. ENDIF. + " Automatic icon scaling (could be overwritten by personal setting) + " see zcl_abapgit_gui_page->html_head lv_xpixel = cl_gui_cfw=>compute_pixel_from_metric( x_or_y = 'X' in = 1 ). IF lv_xpixel >= 2. diff --git a/src/ui/lib/zcl_abapgit_gui_page.clas.abap b/src/ui/lib/zcl_abapgit_gui_page.clas.abap index b946e8506..2e4e9daaa 100644 --- a/src/ui/lib/zcl_abapgit_gui_page.clas.abap +++ b/src/ui/lib/zcl_abapgit_gui_page.clas.abap @@ -112,7 +112,7 @@ ENDCLASS. -CLASS ZCL_ABAPGIT_GUI_PAGE IMPLEMENTATION. +CLASS zcl_abapgit_gui_page IMPLEMENTATION. METHOD constructor. @@ -237,7 +237,8 @@ CLASS ZCL_ABAPGIT_GUI_PAGE IMPLEMENTATION. header_stylesheet_links( ri_html ). header_script_links( ri_html ). - CASE mo_settings->get_icon_scaling( ). " Enforce icon scaling + " Overwrite the automatic icon scaling done in zcl_abapgit_html=>icon + CASE mo_settings->get_icon_scaling( ). WHEN mo_settings->c_icon_scaling-large. ri_html->add( '' ). WHEN mo_settings->c_icon_scaling-small. @@ -249,6 +250,40 @@ CLASS ZCL_ABAPGIT_GUI_PAGE IMPLEMENTATION. ENDMETHOD. + METHOD is_edge_control_warning_needed. + + DATA: + lv_gui_release TYPE zif_abapgit_frontend_services=>ty_gui_release, + lv_gui_sp TYPE zif_abapgit_frontend_services=>ty_gui_sp, + lv_gui_patch TYPE zif_abapgit_frontend_services=>ty_gui_patch, + li_frontend_services TYPE REF TO zif_abapgit_frontend_services. + + " With SAGUI 8.00 PL3 and 7.70 PL13 edge browser control is basically working. + " For lower releases we render the browser control warning + " an toggle it via JS function toggleBrowserControlWarning. + + rv_result = abap_true. + + TRY. + li_frontend_services = zcl_abapgit_ui_factory=>get_frontend_services( ). + li_frontend_services->get_gui_version( + IMPORTING + ev_gui_release = lv_gui_release + ev_gui_sp = lv_gui_sp + ev_gui_patch = lv_gui_patch ). + + CATCH zcx_abapgit_exception. + RETURN. + ENDTRY. + + IF lv_gui_release >= '7700' AND lv_gui_sp >= '1' AND lv_gui_patch >= '13' + OR lv_gui_release >= '8000' AND lv_gui_sp >= '1' AND lv_gui_patch >= '3'. + rv_result = abap_false. + ENDIF. + + ENDMETHOD. + + METHOD render_browser_control_warning. DATA li_documentation_link TYPE REF TO zif_abapgit_html. @@ -500,38 +535,4 @@ CLASS ZCL_ABAPGIT_GUI_PAGE IMPLEMENTATION. ri_html->add( '' ). ENDMETHOD. - - - METHOD is_edge_control_warning_needed. - - DATA: - lv_gui_release TYPE zif_abapgit_frontend_services=>ty_gui_release, - lv_gui_sp TYPE zif_abapgit_frontend_services=>ty_gui_sp, - lv_gui_patch TYPE zif_abapgit_frontend_services=>ty_gui_patch, - li_frontend_services TYPE REF TO zif_abapgit_frontend_services. - - " With SAGUI 8.00 PL3 and 7.70 PL13 edge browser control is basically working. - " For lower releases we render the browser control warning - " an toggle it via JS function toggleBrowserControlWarning. - - rv_result = abap_true. - - TRY. - li_frontend_services = zcl_abapgit_ui_factory=>get_frontend_services( ). - li_frontend_services->get_gui_version( - IMPORTING - ev_gui_release = lv_gui_release - ev_gui_sp = lv_gui_sp - ev_gui_patch = lv_gui_patch ). - - CATCH zcx_abapgit_exception. - RETURN. - ENDTRY. - - IF lv_gui_release >= '7700' AND lv_gui_sp >= '1' AND lv_gui_patch >= '13' - OR lv_gui_release >= '8000' AND lv_gui_sp >= '1' AND lv_gui_patch >= '3'. - rv_result = abap_false. - ENDIF. - - ENDMETHOD. ENDCLASS.