diff options
| -rwxr-xr-x | src/nigui/private/gtk3/platform_impl.nim | 18 | ||||
| -rwxr-xr-x | src/nigui/private/windows/platform_impl.nim | 4 |
2 files changed, 8 insertions, 14 deletions
diff --git a/src/nigui/private/gtk3/platform_impl.nim b/src/nigui/private/gtk3/platform_impl.nim index 514ba4f..7f17bf2 100755 --- a/src/nigui/private/gtk3/platform_impl.nim +++ b/src/nigui/private/gtk3/platform_impl.nim @@ -322,8 +322,6 @@ proc pControlChangedSignal(widget: pointer, data: pointer): Gboolean {.cdecl.} = proc pSetDragDest(widget: pointer) = var target: GtkTargetEntry target.target = "text/uri-list" - target.flags = 0 - target.info = 0 gtk_drag_dest_set(widget, GTK_DEST_DEFAULT_ALL, target.addr, 1, GDK_ACTION_COPY) proc pCreateFont(fontFamily: string, fontSize: float, fontBold: bool): pointer = @@ -674,8 +672,8 @@ method getTextLineWidth(canvas: CanvasImpl, text: string): int {.locks: "unknown if canvas.fFont == nil: canvas.pUpdateFont() pango_layout_set_font_description(layout, canvas.fFont) - var width: cint = 0 - var height: cint = 0 + var width: cint + var height: cint pango_layout_get_pixel_size(layout, width, height) result = width @@ -687,8 +685,8 @@ method getTextLineHeight(canvas: CanvasImpl): int {.locks: "unknown".} = if canvas.fFont == nil: canvas.pUpdateFont() pango_layout_set_font_description(layout, canvas.fFont) - var width: cint = 0 - var height: cint = 0 + var width: cint + var height: cint pango_layout_get_pixel_size(layout, width, height) result = height @@ -1133,8 +1131,8 @@ method `setBackgroundColor`(control: ControlImpl, color: Color) = method getTextLineWidth(control: ControlImpl, text: string): int {.locks: "unknown".} = var layout = gtk_widget_create_pango_layout(control.fHandle, text) - var width: cint = 0 - var height: cint = 0 + var width: cint + var height: cint pango_layout_get_pixel_size(layout, width, height) result = width @@ -1145,8 +1143,8 @@ method getTextLineHeight(control: ControlImpl): int {.locks: "unknown".} = var font = pCreateFont(control.fontFamily, control.fontSize, control.fontBold) pango_layout_set_font_description(layout, font) - var width: cint = 0 - var height: cint = 0 + var width: cint + var height: cint pango_layout_get_pixel_size(layout, width, height) result = height diff --git a/src/nigui/private/windows/platform_impl.nim b/src/nigui/private/windows/platform_impl.nim index 4c6b8d5..5b43570 100755 --- a/src/nigui/private/windows/platform_impl.nim +++ b/src/nigui/private/windows/platform_impl.nim @@ -1013,13 +1013,11 @@ method pUpdateScrollBar(control: ControlImpl) = var si: ScrollInfo si.cbSize = ScrollInfo.sizeOf.int32 si.fMask = SIF_ALL - si.nMin = 0 si.nMax = control.fScrollableWidth.int32 if control.fYScrollEnabled: si.nMax.inc(fScrollbarSize) si.nPage = control.width.int32 si.nPos = control.fXScrollPos.int32 - si.nTrackPos = 0 discard SetScrollInfo(control.fHandle, SB_HORZ, si, false) # Ensure that scroll pos is within range: control.fXScrollPos = max(min(control.fXScrollPos, si.nMax - control.width), 0) @@ -1031,13 +1029,11 @@ method pUpdateScrollBar(control: ControlImpl) = var si: ScrollInfo si.cbSize = ScrollInfo.sizeOf.int32 si.fMask = SIF_ALL - si.nMin = 0 si.nMax = control.fScrollableHeight.int32 if control.fXScrollEnabled: si.nMax.inc(fScrollbarSize) si.nPage = control.height.int32 si.nPos = control.fYScrollPos.int32 - si.nTrackPos = 0 discard SetScrollInfo(control.fHandle, SB_VERT, si, false) # Ensure that scroll pos is within range: control.fYScrollPos = max(min(control.fYScrollPos, si.nMax - control.height), 0) |