Changeset 126419 in webkit


Ignore:
Timestamp:
Aug 23, 2012 6:04:48 AM (12 years ago)
Author:
ryuan.choi@samsung.com
Message:

[EFL] Add url bar to EWebLauncher and MiniBrowser/Efl.
https://bugs.webkit.org/show_bug.cgi?id=63966

Reviewed by Kenneth Rohde Christiansen.

EWebLauncher and MiniBrowser/Efl did not have functionality that users
navigates the site which they want.
This patch adds the urlbar and functionality to load url which users want.

  • CMakeLists.txt:

Added to share urlbar theme for both EWebLauncher and MiniBrowser/Efl.

  • EWebLauncher/CMakeLists.txt:

Added urlbar.c and dependency of urlbar theme.
In addition, changed macro name to THEME_DIR to share the code easily.

  • EWebLauncher/ControlTheme/CMakeLists.txt: Added for urlbar theme.
  • EWebLauncher/ControlTheme/entry.edc: Implemented urlbar theme.
  • EWebLauncher/main.c:

Implemented to use the urlbar.
In addition, remove unnecessary border of webview to control webview and urlbar easily.
(_ELauncher):
(on_url_changed):
(browserCreate):
(closeWindow):
(findThemePath):

  • EWebLauncher/url_bar.c: Implemented functionality of the urlbar.

(_url_bar_url_get_with_protocol):
(on_urlbar_key_down):
(on_urlbar_mouse_down):
(on_urlbar_focus_out):
(url_bar_add):
(url_bar_del):
(url_bar_url_set):

  • EWebLauncher/url_bar.h: Added.
  • MiniBrowser/efl/CMakeLists.txt:
  • MiniBrowser/efl/main.c: Implemented to use the urlbar.

(_MiniBrowser):
(on_url_changed):
(browserCreate):

Location:
trunk/Tools
Files:
5 added
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/CMakeLists.txt

    r123859 r126419  
    44
    55IF ("${PORT}" STREQUAL "Efl")
     6    ADD_SUBDIRECTORY(EWebLauncher/ControlTheme)
     7
    68    IF (ENABLE_WEBKIT)
    79        ADD_SUBDIRECTORY(DumpRenderTree/efl)
  • trunk/Tools/ChangeLog

    r126418 r126419  
     12012-08-23  Ryuan Choi  <ryuan.choi@samsung.com>
     2
     3        [EFL] Add url bar to EWebLauncher and MiniBrowser/Efl.
     4        https://bugs.webkit.org/show_bug.cgi?id=63966
     5
     6        Reviewed by Kenneth Rohde Christiansen.
     7
     8        EWebLauncher and MiniBrowser/Efl did not have functionality that users
     9        navigates the site which they want.
     10        This patch adds the urlbar and functionality to load url which users want.
     11
     12        * CMakeLists.txt:
     13        Added to share urlbar theme for both EWebLauncher and MiniBrowser/Efl.
     14        * EWebLauncher/CMakeLists.txt:
     15        Added urlbar.c and dependency of urlbar theme.
     16        In addition, changed macro name to THEME_DIR to share the code easily.
     17        * EWebLauncher/ControlTheme/CMakeLists.txt: Added for urlbar theme.
     18        * EWebLauncher/ControlTheme/entry.edc: Implemented urlbar theme.
     19        * EWebLauncher/main.c:
     20        Implemented to use the urlbar.
     21        In addition, remove unnecessary border of webview to control webview and urlbar easily.
     22        (_ELauncher):
     23        (on_url_changed):
     24        (browserCreate):
     25        (closeWindow):
     26        (findThemePath):
     27        * EWebLauncher/url_bar.c: Implemented functionality of the urlbar.
     28        (_url_bar_url_get_with_protocol):
     29        (on_urlbar_key_down):
     30        (on_urlbar_mouse_down):
     31        (on_urlbar_focus_out):
     32        (url_bar_add):
     33        (url_bar_del):
     34        (url_bar_url_set):
     35        * EWebLauncher/url_bar.h: Added.
     36        * MiniBrowser/efl/CMakeLists.txt:
     37        * MiniBrowser/efl/main.c: Implemented to use the urlbar.
     38        (_MiniBrowser):
     39        (on_url_changed):
     40        (browserCreate):
     41
    1422012-08-23  Balazs Kelemen  <kbalazs@webkit.org>
    243
  • trunk/Tools/EWebLauncher/CMakeLists.txt

    r125467 r126419  
    11SET(EWebLauncher_SOURCES
     2    ${TOOLS_DIR}/EWebLauncher/url_bar.c
    23    ${TOOLS_DIR}/EWebLauncher/main.c
    34)
     
    3637)
    3738
    38 ADD_DEFINITIONS(-DDATA_DIR=\"${THEME_BINARY_DIR}\")
     39ADD_DEFINITIONS(-DTHEME_DIR=\"${THEME_BINARY_DIR}\")
    3940
    4041INCLUDE_DIRECTORIES(${EWebLauncher_INCLUDE_DIRECTORIES})
     
    4344ADD_TARGET_PROPERTIES(EWebLauncher LINK_FLAGS "${EWebLauncher_LINK_FLAGS}")
    4445SET_TARGET_PROPERTIES(EWebLauncher PROPERTIES FOLDER "Tools")
     46
     47ADD_DEPENDENCIES(EWebLauncher ControlTheme)
  • trunk/Tools/EWebLauncher/main.c

    r118329 r126419  
    3131#include "EWebKit.h"
    3232
    33 #include <ctype.h>
     33#include "url_bar.h"
    3434#include <Ecore.h>
    3535#include <Ecore_Evas.h>
     
    3939#include <Edje.h>
    4040#include <Evas.h>
     41#include <ctype.h>
    4142#include <inttypes.h>
    4243#include <limits.h>
     
    144145    Evas_Object *bg;
    145146    Evas_Object *browser;
     147    Url_Bar *url_bar;
    146148    const char *theme;
    147149    const char *userAgent;
     
    400402    info("    Keyboard flags: %#.2x\n", imh);
    401403
     404}
     405
     406static void
     407on_url_changed(void* user_data, Evas_Object* webview, void* event_info)
     408{
     409    ELauncher *app = (ELauncher *)user_data;
     410    url_bar_url_set(app->url_bar, ewk_view_uri_get(app->browser));
    402411}
    403412
     
    696705    evas_object_smart_callback_add(app->browser, "tooltip,text,set", on_tooltip_text_set, app);
    697706    evas_object_smart_callback_add(app->browser, "inputmethod,changed", on_inputmethod_changed, app);
     707    evas_object_smart_callback_add(app->browser, "uri,changed", on_url_changed, app);
    698708
    699709/*     ewk_callback_resize_requested_add(app->browser, on_resize_requested, app->ee); */
     
    705715    evas_object_event_callback_add(app->browser, EVAS_CALLBACK_DEL, on_browser_del, app);
    706716
    707     evas_object_move(app->browser, 10, 10);
    708     evas_object_resize(app->browser, geometry.w - 20, geometry.h - 20);
     717    app->url_bar = url_bar_add(app->browser, DEFAULT_WIDTH);
     718
     719    evas_object_move(app->browser, 0, URL_BAR_HEIGHT);
     720    evas_object_resize(app->browser, geometry.w, geometry.h - URL_BAR_HEIGHT);
    709721
    710722    if (url && (url[0] != '\0'))
     
    740752    }
    741753    windows = eina_list_remove(windows, app);
     754    url_bar_del(((ELauncher *)app)->url_bar);
    742755    browserDestroy(ee);
    743756    free(app);
     
    761774findThemePath(const char *theme)
    762775{
    763     const char *defaultTheme = DATA_DIR"/default.edj";
     776    const char *default_theme = THEME_DIR"/default.edj";
    764777    char *rpath;
    765778    struct stat st;
    766779
    767780    if (!theme)
    768         theme = defaultTheme;
     781        theme = default_theme;
    769782
    770783    rpath = ecore_file_realpath(theme);
  • trunk/Tools/MiniBrowser/efl/CMakeLists.txt

    r125467 r126419  
    22
    33SET(MiniBrowser_SOURCES
     4    ${TOOLS_DIR}/EWebLauncher/url_bar.c
    45    ${MiniBrowser_DIR}/main.c
    56)
     
    1112    ${EFLDEPS_INCLUDE_DIRS}
    1213    ${EVAS_INCLUDE_DIRS}
     14    ${TOOLS_DIR}/EWebLauncher
    1315    ${WEBKIT2_DIR}/UIProcess/API/efl
    1416    ${WEBKIT2_DIR}
     
    5557ADD_TARGET_PROPERTIES(MiniBrowser LINK_FLAGS "${MiniBrowser_LINK_FLAGS}")
    5658SET_TARGET_PROPERTIES(MiniBrowser PROPERTIES FOLDER "Tools")
     59
     60ADD_DEPENDENCIES(MiniBrowser ThemeControl)
  • trunk/Tools/MiniBrowser/efl/main.c

    r123872 r126419  
    1919
    2020#include "EWebKit2.h"
     21#include "url_bar.h"
    2122#include <Ecore.h>
    2223#include <Ecore_Evas.h>
     
    4243    Evas_Object *bg;
    4344    Evas_Object *browser;
     45    Url_Bar *url_bar;
    4446} MiniBrowser;
    4547
     
    156158
    157159static void
     160on_url_changed(void *user_data, Evas_Object *webview, void *event_info)
     161{
     162    MiniBrowser *app = (MiniBrowser *)user_data;
     163    url_bar_url_set(app->url_bar, ewk_view_uri_get(app->browser));
     164}
     165
     166static void
    158167on_progress(void *user_data, Evas_Object *webview, void *event_info)
    159168{
     
    225234    evas_object_smart_callback_add(app->browser, "load,progress", on_progress, app);
    226235    evas_object_smart_callback_add(app->browser, "title,changed", on_title_changed, app);
     236    evas_object_smart_callback_add(app->browser, "uri,changed", on_url_changed, app);
    227237
    228238    evas_object_event_callback_add(app->browser, EVAS_CALLBACK_KEY_DOWN, on_key_down, app);
    229239
    230240    evas_object_size_hint_weight_set(app->browser, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    231     evas_object_resize(app->browser, DEFAULT_WIDTH, DEFAULT_HEIGHT);
     241    evas_object_move(app->browser, 0, URL_BAR_HEIGHT);
     242    evas_object_resize(app->browser, DEFAULT_WIDTH, DEFAULT_HEIGHT - URL_BAR_HEIGHT);
    232243    evas_object_show(app->browser);
    233244    evas_object_focus_set(app->browser, EINA_TRUE);
     245
     246    app->url_bar = url_bar_add(app->browser, DEFAULT_WIDTH);
    234247
    235248    ewk_view_uri_set(app->browser, url);
Note: See TracChangeset for help on using the changeset viewer.