Skip to content

Commit a65fb38

Browse files
committed
remove useless null checks
1 parent f21a892 commit a65fb38

2 files changed

Lines changed: 4 additions & 16 deletions

File tree

lang/libs/window/posix/linux.ch

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,7 @@ func apply_cursor(w : *mut Window) {
329329
if(gdkwin == null) {
330330
return
331331
}
332+
ensure_gtk_init()
332333
var cursor = gdk_cursor_new_from_name(gdk_display_get_default(), cursor_name_for_kind(w.cursor))
333334
if(cursor != null) {
334335
gdk_window_set_cursor(gdkwin, cursor)
@@ -956,10 +957,12 @@ public func window_scale_factor(w : *mut Window) : double {
956957
}
957958

958959
public func window_monitor_count() : int {
960+
ensure_gtk_init()
959961
return gdk_display_get_n_monitors(gdk_display_get_default())
960962
}
961963

962964
public func window_monitor_bounds(index : int) : Rect {
965+
ensure_gtk_init()
963966
var display = gdk_display_get_default()
964967
var monitor = gdk_display_get_monitor(display, index)
965968
var rect = GdkRectangle { x : 0, y : 0, width : 0, height : 0 }
@@ -970,6 +973,7 @@ public func window_monitor_bounds(index : int) : Rect {
970973
}
971974

972975
public func window_monitor_scale(index : int) : double {
976+
ensure_gtk_init()
973977
var display = gdk_display_get_default()
974978
var monitor = gdk_display_get_monitor(display, index)
975979
var scale = 1

lang/libs/window/win/win.ch

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -631,9 +631,6 @@ func win_window_proc(hwnd : HWND, msg : UINT, wp : WPARAM, lp : LPARAM) : LRESUL
631631
// ===========================================================================
632632

633633
public func window_create(w : *mut Window) : std::Result<std::Unit, WindowError> {
634-
if(w == null) {
635-
return std.Result.Err(WindowError.InvalidState(string("window_create: null window")))
636-
}
637634
if(w.created) {
638635
return std.Result.Err(WindowError.InvalidState(string("window_create: window already created")))
639636
}
@@ -704,9 +701,6 @@ public func window_create(w : *mut Window) : std::Result<std::Unit, WindowError>
704701
}
705702

706703
public func window_destroy(w : *mut Window) {
707-
if(w == null) {
708-
return
709-
}
710704
if(w.hwnd != null) {
711705
DestroyWindow(w.hwnd)
712706
w.hwnd = null
@@ -716,9 +710,6 @@ public func window_destroy(w : *mut Window) {
716710
}
717711

718712
public func window_is_created(w : *mut Window) : bool {
719-
if(w == null) {
720-
return false
721-
}
722713
return w.created && w.hwnd != null
723714
}
724715

@@ -729,7 +720,6 @@ public func window_title(w : *mut Window) : string {
729720
}
730721

731722
public func window_set_title(w : *mut Window, title : *char) {
732-
if(w == null) { return }
733723
w.title = string("")
734724
if(title != null) {
735725
w.title.append_char_ptr(title)
@@ -759,7 +749,6 @@ public func window_client_size(w : *mut Window) : Size {
759749
}
760750

761751
public func window_set_size(w : *mut Window, width : int, height : int) {
762-
if(w == null) { return }
763752
w.width = width
764753
w.height = height
765754
if(w.hwnd == null) {
@@ -797,7 +786,6 @@ public func window_position(w : *mut Window) : Position {
797786
}
798787

799788
public func window_set_position(w : *mut Window, x : int, y : int) {
800-
if(w == null) { return }
801789
w.x = x
802790
w.y = y
803791
if(w.hwnd != null) {
@@ -918,7 +906,6 @@ public func window_close(w : *mut Window) {
918906
// --- visual ---
919907

920908
public func window_set_cursor(w : *mut Window, cursor : int) {
921-
if(w == null) { return }
922909
w.cursor = cursor
923910
SetCursor(cursor_for_kind(cursor))
924911
}
@@ -944,7 +931,6 @@ public func window_set_icon(w : *mut Window, path : *char) {
944931
}
945932

946933
public func window_set_opacity(w : *mut Window, opacity : double) {
947-
if(w == null) { return }
948934
w.opacity = opacity
949935
if(w.hwnd == null) {
950936
return
@@ -961,7 +947,6 @@ public func window_set_opacity(w : *mut Window, opacity : double) {
961947
}
962948

963949
public func window_set_always_on_top(w : *mut Window, on_top : bool) {
964-
if(w == null) { return }
965950
w.always_on_top = on_top
966951
if(w.hwnd != null) {
967952
if(on_top) {
@@ -973,7 +958,6 @@ public func window_set_always_on_top(w : *mut Window, on_top : bool) {
973958
}
974959

975960
public func window_set_decorated(w : *mut Window, decorated : bool) {
976-
if(w == null) { return }
977961
if(decorated == w.decorated) {
978962
return
979963
}

0 commit comments

Comments
 (0)