Changeset 126419 in webkit
- Timestamp:
- Aug 23, 2012 6:04:48 AM (12 years ago)
- Location:
- trunk/Tools
- Files:
-
- 5 added
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/CMakeLists.txt
r123859 r126419 4 4 5 5 IF ("${PORT}" STREQUAL "Efl") 6 ADD_SUBDIRECTORY(EWebLauncher/ControlTheme) 7 6 8 IF (ENABLE_WEBKIT) 7 9 ADD_SUBDIRECTORY(DumpRenderTree/efl) -
trunk/Tools/ChangeLog
r126418 r126419 1 2012-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 1 42 2012-08-23 Balazs Kelemen <kbalazs@webkit.org> 2 43 -
trunk/Tools/EWebLauncher/CMakeLists.txt
r125467 r126419 1 1 SET(EWebLauncher_SOURCES 2 ${TOOLS_DIR}/EWebLauncher/url_bar.c 2 3 ${TOOLS_DIR}/EWebLauncher/main.c 3 4 ) … … 36 37 ) 37 38 38 ADD_DEFINITIONS(-D DATA_DIR=\"${THEME_BINARY_DIR}\")39 ADD_DEFINITIONS(-DTHEME_DIR=\"${THEME_BINARY_DIR}\") 39 40 40 41 INCLUDE_DIRECTORIES(${EWebLauncher_INCLUDE_DIRECTORIES}) … … 43 44 ADD_TARGET_PROPERTIES(EWebLauncher LINK_FLAGS "${EWebLauncher_LINK_FLAGS}") 44 45 SET_TARGET_PROPERTIES(EWebLauncher PROPERTIES FOLDER "Tools") 46 47 ADD_DEPENDENCIES(EWebLauncher ControlTheme) -
trunk/Tools/EWebLauncher/main.c
r118329 r126419 31 31 #include "EWebKit.h" 32 32 33 #include <ctype.h>33 #include "url_bar.h" 34 34 #include <Ecore.h> 35 35 #include <Ecore_Evas.h> … … 39 39 #include <Edje.h> 40 40 #include <Evas.h> 41 #include <ctype.h> 41 42 #include <inttypes.h> 42 43 #include <limits.h> … … 144 145 Evas_Object *bg; 145 146 Evas_Object *browser; 147 Url_Bar *url_bar; 146 148 const char *theme; 147 149 const char *userAgent; … … 400 402 info(" Keyboard flags: %#.2x\n", imh); 401 403 404 } 405 406 static void 407 on_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)); 402 411 } 403 412 … … 696 705 evas_object_smart_callback_add(app->browser, "tooltip,text,set", on_tooltip_text_set, app); 697 706 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); 698 708 699 709 /* ewk_callback_resize_requested_add(app->browser, on_resize_requested, app->ee); */ … … 705 715 evas_object_event_callback_add(app->browser, EVAS_CALLBACK_DEL, on_browser_del, app); 706 716 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); 709 721 710 722 if (url && (url[0] != '\0')) … … 740 752 } 741 753 windows = eina_list_remove(windows, app); 754 url_bar_del(((ELauncher *)app)->url_bar); 742 755 browserDestroy(ee); 743 756 free(app); … … 761 774 findThemePath(const char *theme) 762 775 { 763 const char *default Theme = DATA_DIR"/default.edj";776 const char *default_theme = THEME_DIR"/default.edj"; 764 777 char *rpath; 765 778 struct stat st; 766 779 767 780 if (!theme) 768 theme = default Theme;781 theme = default_theme; 769 782 770 783 rpath = ecore_file_realpath(theme); -
trunk/Tools/MiniBrowser/efl/CMakeLists.txt
r125467 r126419 2 2 3 3 SET(MiniBrowser_SOURCES 4 ${TOOLS_DIR}/EWebLauncher/url_bar.c 4 5 ${MiniBrowser_DIR}/main.c 5 6 ) … … 11 12 ${EFLDEPS_INCLUDE_DIRS} 12 13 ${EVAS_INCLUDE_DIRS} 14 ${TOOLS_DIR}/EWebLauncher 13 15 ${WEBKIT2_DIR}/UIProcess/API/efl 14 16 ${WEBKIT2_DIR} … … 55 57 ADD_TARGET_PROPERTIES(MiniBrowser LINK_FLAGS "${MiniBrowser_LINK_FLAGS}") 56 58 SET_TARGET_PROPERTIES(MiniBrowser PROPERTIES FOLDER "Tools") 59 60 ADD_DEPENDENCIES(MiniBrowser ThemeControl) -
trunk/Tools/MiniBrowser/efl/main.c
r123872 r126419 19 19 20 20 #include "EWebKit2.h" 21 #include "url_bar.h" 21 22 #include <Ecore.h> 22 23 #include <Ecore_Evas.h> … … 42 43 Evas_Object *bg; 43 44 Evas_Object *browser; 45 Url_Bar *url_bar; 44 46 } MiniBrowser; 45 47 … … 156 158 157 159 static void 160 on_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 166 static void 158 167 on_progress(void *user_data, Evas_Object *webview, void *event_info) 159 168 { … … 225 234 evas_object_smart_callback_add(app->browser, "load,progress", on_progress, app); 226 235 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); 227 237 228 238 evas_object_event_callback_add(app->browser, EVAS_CALLBACK_KEY_DOWN, on_key_down, app); 229 239 230 240 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); 232 243 evas_object_show(app->browser); 233 244 evas_object_focus_set(app->browser, EINA_TRUE); 245 246 app->url_bar = url_bar_add(app->browser, DEFAULT_WIDTH); 234 247 235 248 ewk_view_uri_set(app->browser, url);
Note: See TracChangeset
for help on using the changeset viewer.