Skip to content

Commit

Permalink
Apply lint suggestions
Browse files Browse the repository at this point in the history
  • Loading branch information
pwiecz committed May 17, 2023
1 parent 599ba40 commit 3d09a1d
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 20 deletions.
22 changes: 8 additions & 14 deletions browser.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ type Browser struct {
}

var (
InvalidLine = errors.New("line doesn't exist")
ErrInvalidLine = errors.New("line doesn't exist")
)

func NewBrowser(x, y, w, h int, text ...string) *Browser {
Expand Down Expand Up @@ -54,7 +54,7 @@ func (b *Browser) TopLine() int {

func (b *Browser) SetBottomLine(line int) error {
if line < 1 || line > b.Size() {
return InvalidLine
return ErrInvalidLine
}

C.go_fltk_Browser_set_bottomline((*C.Fl_Browser)(b.ptr()), C.int(line))
Expand All @@ -63,7 +63,7 @@ func (b *Browser) SetBottomLine(line int) error {

func (b *Browser) SetMiddleLine(line int) error {
if line < 1 || line > b.Size() {
return InvalidLine
return ErrInvalidLine
}

C.go_fltk_Browser_set_middleline((*C.Fl_Browser)(b.ptr()), C.int(line))
Expand All @@ -72,7 +72,7 @@ func (b *Browser) SetMiddleLine(line int) error {

func (b *Browser) SetTopLine(line int) error {
if line < 1 || line > b.Size() {
return InvalidLine
return ErrInvalidLine
}

C.go_fltk_Browser_set_topline((*C.Fl_Browser)(b.ptr()), C.int(line))
Expand All @@ -89,7 +89,7 @@ func (b *Browser) Clear() {

func (b *Browser) Remove(line int) error {
if line < 1 || line > b.Size() {
return InvalidLine
return ErrInvalidLine
}
delete(b.icons, line)

Expand All @@ -114,7 +114,7 @@ func (b *Browser) SetColumnChar(r rune) {

func (b *Browser) HideLine(line int) error {
if line < 1 || line > b.Size() {
return InvalidLine
return ErrInvalidLine
}

C.go_fltk_Browser_hide_line((*C.Fl_Browser)(b.ptr()), C.int(line))
Expand Down Expand Up @@ -152,22 +152,16 @@ func (b *Browser) SetFormatChar(r rune) {
}

func (b *Browser) Displayed(line int) bool {
if C.go_fltk_Browser_displayed((*C.Fl_Browser)(b.ptr()), C.int(line)) == 1 {
return true
}

return false
return C.go_fltk_Browser_displayed((*C.Fl_Browser)(b.ptr()), C.int(line)) == 1
}

func (b *Browser) Text(line int) string {
cStr := C.go_fltk_Browser_text((*C.Fl_Browser)(b.ptr()), C.int(line))
//defer C.free(unsafe.Pointer(cStr))

return C.GoString(cStr)
}

func (b *Browser) SetColumnWidths(widths ...int) {
cArr := make([]C.int, len(widths), len(widths))
cArr := make([]C.int, len(widths))
for i, v := range widths {
cArr[i] = C.int(v)
}
Expand Down
2 changes: 1 addition & 1 deletion image.go
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ func NewSharedImageLoad(path string) (*SharedImage, error) {
img := &SharedImage{}
initImage(img, unsafe.Pointer(C.go_fltk_shared_image_load(fileStr)))
if img.iPtr == nil {
return nil, errors.New("Shared Image initialization error")
return nil, errors.New("shared Image initialization error")
}
return img, image_error(img.fail())
}
6 changes: 1 addition & 5 deletions text.go
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,7 @@ func (b *TextBuffer) Select(start, end int) {

// Selected Check if any text is selected
func (b *TextBuffer) IsSelected(start, end int) bool {
selected := C.go_fltk_TextBuffer_selected(b.ptr())
if int(selected) == 0 {
return false
}
return true
return C.go_fltk_TextBuffer_selected(b.ptr()) != 0
}

// GetSelectionPosition - Get position (start, end) of the currently selected text
Expand Down

0 comments on commit 3d09a1d

Please sign in to comment.