Skip to content

Commit

Permalink
Breaking API: consitence between on_X and set_X
Browse files Browse the repository at this point in the history
  • Loading branch information
@Lecrapouille
Lecrapouille committed Jan 25, 2024
1 parent f7487c3 commit fc6f0f1
Show file tree
Hide file tree
Showing 5 changed files with 72 additions and 76 deletions.
28 changes: 14 additions & 14 deletions addons/gdcef/demos/2D/CEF.gd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ func create_browser(url):
return null
$Panel/VBox/HBox/BrowserList.add_item(url)
$Panel/VBox/HBox/BrowserList.select($Panel/VBox/HBox/BrowserList.get_item_count() - 1)
browser.connect("page_loaded", _on_page_loaded)
browser.connect("page_failed_loading", _on_page_failed_loading)
browser.connect("on_page_loaded", _on_page_loaded)
browser.connect("on_page_failed_loading", _on_page_failed_loading)
$Panel/VBox/TextureRect.texture = browser.get_texture()
return browser

Expand Down Expand Up @@ -165,31 +165,31 @@ func _on_TextureRect_gui_input(event):
return
if event is InputEventMouseButton:
if event.button_index == MOUSE_BUTTON_WHEEL_UP:
current_browser.on_mouse_wheel_vertical(2)
current_browser.set_mouse_wheel_vertical(2)
elif event.button_index == MOUSE_BUTTON_WHEEL_DOWN:
current_browser.on_mouse_wheel_vertical(-2)
current_browser.set_mouse_wheel_vertical(-2)
elif event.button_index == MOUSE_BUTTON_LEFT:
mouse_pressed = event.pressed
if mouse_pressed:
current_browser.on_mouse_left_down()
current_browser.set_mouse_left_down()
else:
current_browser.on_mouse_left_up()
current_browser.set_mouse_left_up()
elif event.button_index == MOUSE_BUTTON_RIGHT:
mouse_pressed = event.pressed
if mouse_pressed:
current_browser.on_mouse_right_down()
current_browser.set_mouse_right_down()
else:
current_browser.on_mouse_right_up()
current_browser.set_mouse_right_up()
else:
mouse_pressed = event.pressed
if mouse_pressed:
current_browser.on_mouse_middle_down()
current_browser.set_mouse_middle_down()
else:
current_browser.on_mouse_middle_up()
current_browser.set_mouse_middle_up()
elif event is InputEventMouseMotion:
if mouse_pressed:
current_browser.on_mouse_left_down()
current_browser.on_mouse_moved(event.position.x, event.position.y)
current_browser.set_mouse_left_down()
current_browser.set_mouse_moved(event.position.x, event.position.y)
pass

# ==============================================================================
Expand All @@ -199,7 +199,7 @@ func _input(event):
if current_browser == null:
return
if event is InputEventKey:
current_browser.on_key_pressed(
current_browser.set_key_pressed(
event.unicode if event.unicode != 0 else event.keycode, # Godot3: event.scancode,
event.pressed, event.shift_pressed, event.alt_pressed, event.is_command_or_control_pressed())
pass
Expand All @@ -220,7 +220,7 @@ func _ready():
var file = FileAccess.open(DEFAULT_PAGE, FileAccess.WRITE)
file.store_string("<html><body bgcolor=\"white\"><h2>Welcome to gdCEF !</h2><p>This a generated page.</p></body></html>")
file = null

if !$CEF.initialize({"locale":"en-US"}):
$Panel/VBox/HBox/Info.set_text($CEF.get_error())
push_error($CEF.get_error())
Expand Down
24 changes: 12 additions & 12 deletions addons/gdcef/demos/3D/GUI.gd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,31 +71,31 @@ func _on_TextureRect_gui_input(event):
return
if event is InputEventMouseButton:
if event.button_index == MOUSE_BUTTON_WHEEL_UP:
browser.on_mouse_wheel_vertical(2)
browser.set_mouse_wheel_vertical(2)
elif event.button_index == MOUSE_BUTTON_WHEEL_DOWN:
browser.on_mouse_wheel_vertical(-2)
browser.set_mouse_wheel_vertical(-2)
elif event.button_index == MOUSE_BUTTON_LEFT:
mouse_pressed = event.pressed
if mouse_pressed:
browser.on_mouse_left_down()
browser.set_mouse_left_down()
else:
browser.on_mouse_left_up()
browser.set_mouse_left_up()
elif event.button_index == MOUSE_BUTTON_RIGHT:
mouse_pressed = event.pressed
if mouse_pressed:
browser.on_mouse_right_down()
browser.set_mouse_right_down()
else:
browser.on_mouse_right_up()
browser.set_mouse_right_up()
else:
mouse_pressed = event.pressed
if mouse_pressed:
browser.on_mouse_middle_down()
browser.set_mouse_middle_down()
else:
browser.on_mouse_middle_up()
browser.set_mouse_middle_up()
elif event is InputEventMouseMotion:
if mouse_pressed == true :
browser.on_mouse_left_down()
browser.on_mouse_moved(event.position.x, event.position.y)
browser.set_mouse_left_down()
browser.set_mouse_moved(event.position.x, event.position.y)
pass

# ==============================================================================
Expand All @@ -107,7 +107,7 @@ func _input(event):
$Panel/Label.set_text("Failed getting Godot node " + browser_name)
return
if event is InputEventKey:
browser.on_key_pressed(
browser.set_key_pressed(
event.unicode if event.unicode != 0 else event.keycode, # Godot3: event.scancode,
event.pressed, event.shift_pressed, event.alt_pressed, event.is_command_or_control_pressed())
pass
Expand Down Expand Up @@ -144,7 +144,7 @@ func _ready():
await get_tree().process_frame
var S = $Panel/TextureRect.get_size()
var browser = $CEF.create_browser("https://github.com/Lecrapouille/gdcef", browser_name, S.x, S.y, {"javascript":true})
browser.connect("page_loaded", Callable(self, "_on_page_loaded"))
browser.connect("on_page_loaded", Callable(self, "_on_page_loaded"))
$Panel/TextureRect.texture = browser.get_texture()

# ==============================================================================
Expand Down
28 changes: 12 additions & 16 deletions addons/gdcef/demos/HelloCEF/Control.gd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ const pages = [
# Iterator on the array holding URLs.
@onready var iterator = 0

# The left browser is allowed for mouse and keyboard interaction.
# The right browser is disable because we are automatically switching of pages.
@onready var active_browser = "left"

# Memorize if the mouse was pressed
@onready var mouse_pressed : bool = false

Expand All @@ -49,31 +45,31 @@ func _on_Texture1_gui_input(event):
return
if event is InputEventMouseButton:
if event.button_index == MOUSE_BUTTON_WHEEL_UP:
browser.on_mouse_wheel_vertical(2)
browser.set_mouse_wheel_vertical(2)
elif event.button_index == MOUSE_BUTTON_WHEEL_DOWN:
browser.on_mouse_wheel_vertical(-2)
browser.set_mouse_wheel_vertical(-2)
elif event.button_index == MOUSE_BUTTON_LEFT:
mouse_pressed = event.pressed
if mouse_pressed:
browser.on_mouse_left_down()
browser.set_mouse_left_down()
else:
browser.on_mouse_left_up()
browser.set_mouse_left_up()
elif event.button_index == MOUSE_BUTTON_RIGHT:
mouse_pressed = event.pressed
if mouse_pressed:
browser.on_mouse_right_down()
browser.set_mouse_right_down()
else:
browser.on_mouse_right_up()
browser.set_mouse_right_up()
else:
mouse_pressed = event.pressed
if mouse_pressed:
browser.on_mouse_middle_down()
browser.set_mouse_middle_down()
else:
browser.on_mouse_middle_up()
browser.set_mouse_middle_up()
elif event is InputEventMouseMotion:
if mouse_pressed == true :
browser.on_mouse_left_down()
browser.on_mouse_moved(event.position.x, event.position.y)
browser.set_mouse_left_down()
browser.set_mouse_moved(event.position.x, event.position.y)
pass

# ==============================================================================
Expand All @@ -85,7 +81,7 @@ func _input(event):
$Panel/Label.set_text("Failed getting Godot node 'left'")
return
if event is InputEventKey:
browser.on_key_pressed(
browser.set_key_pressed(
event.unicode if event.unicode != 0 else event.keycode, # Godot3: event.scancode,
event.pressed, event.shift_pressed, event.alt_pressed, event.is_command_or_control_pressed())
pass
Expand Down Expand Up @@ -158,7 +154,7 @@ func _ready():

# Connect the event when a page has bee loaded and wait 6 seconds before
# loading the page.
right.connect("page_loaded", Callable(self, "_on_page_loaded"))
right.connect("on_page_loaded", Callable(self, "_on_page_loaded"))
var _err = $Timer.connect("timeout", Callable(self, "_on_Timer_timeout"))
pass

Expand Down
Loading

0 comments on commit fc6f0f1

Please sign in to comment.