瀏覽代碼

Fixed missing returns. Added consts.

Brucey 5 年之前
父節點
當前提交
47000c86f7
共有 2 個文件被更改,包括 94 次插入2 次删除
  1. 92 0
      gui.mod/common.bmx
  2. 2 2
      gui.mod/gui.bmx

+ 92 - 0
gui.mod/common.bmx

@@ -79,3 +79,95 @@ Extern
 	Function bmx_raygui_GuiLoadStyleDefault()="GuiLoadStyleDefault"
 
 End Extern
+
+Const GUI_DEFAULT:Int = 0
+Const LABEL:Int = 1
+Const BUTTON:Int = 2
+Const TOGGLE:Int = 3
+Const SLIDER:Int = 4
+Const PROGRESSBAR:Int = 5
+Const CHECKBOX:Int = 6
+Const COMBOBOX:Int = 7
+Const DROPDOWNBOX:Int = 8
+Const TEXTBOX:Int = 9
+Const VALUEBOX:Int = 10
+Const SPINNER:Int = 11
+Const LISTVIEW:Int = 12
+Const COLORPICKER:Int = 13
+Const SCROLLBAR:Int = 14
+Const STATUSBAR:Int = 15
+
+Const GUI_STATE_NORMAL:Int = 0
+Const GUI_STATE_FOCUSED:Int = 1
+Const GUI_STATE_PRESSED:Int = 2
+Const GUI_STATE_DISABLED:Int = 3
+
+Const GUI_TEXT_ALIGN_LEFT:Int = 0
+Const GUI_TEXT_ALIGN_CENTER:Int = 1
+Const GUI_TEXT_ALIGN_RIGHT:Int = 2
+
+Const BORDER_COLOR_NORMAL:Int = 0
+Const BASE_COLOR_NORMAL:Int = 1
+Const TEXT_COLOR_NORMAL:Int = 2
+Const BORDER_COLOR_FOCUSED:Int = 3
+Const BASE_COLOR_FOCUSED:Int = 4
+Const TEXT_COLOR_FOCUSED:Int = 5
+Const BORDER_COLOR_PRESSED:Int = 6
+Const BASE_COLOR_PRESSED:Int = 7
+Const TEXT_COLOR_PRESSED:Int = 8
+Const BORDER_COLOR_DISABLED:Int = 9
+Const BASE_COLOR_DISABLED:Int = 10
+Const TEXT_COLOR_DISABLED:Int = 11
+Const BORDER_WIDTH:Int = 12
+Const TEXT_PADDING:Int = 13
+Const TEXT_ALIGNMENT:Int = 14
+Const RESERVED:Int = 15
+
+Const TEXT_SIZE:Int = 16
+Const TEXT_SPACING:Int = 17
+Const LINE_COLOR:Int = 18
+Const BACKGROUND_COLOR:Int = 19
+
+Const GROUP_PADDING:Int = 16
+
+Const SLIDER_WIDTH:Int = 16
+Const SLIDER_PADDING:Int = 17
+
+Const PROGRESS_PADDING:Int = 16
+
+Const CHECK_PADDING:Int = 16
+
+Const COMBO_BUTTON_WIDTH:Int = 16
+Const COMBO_BUTTON_PADDING:Int = 17
+
+Const ARROW_PADDING:Int = 16
+Const DROPDOWN_ITEMS_PADDING:Int = 17
+
+Const TEXT_INNER_PADDING:Int = 16
+Const TEXT_LINES_PADDING:Int = 17
+Const COLOR_SELECTED_FG:Int = 18
+Const COLOR_SELECTED_BG:Int = 19
+
+Const SPIN_BUTTON_WIDTH:Int = 16
+Const SPIN_BUTTON_PADDING:Int = 17
+
+Const ARROWS_SIZE:Int = 16
+Const ARROWS_VISIBLE:Int = 17
+Const SCROLL_SLIDER_PADDING:Int = 18
+Const SCROLL_SLIDER_SIZE:Int = 19
+Const SCROLL_PADDING:Int = 20
+Const SCROLL_SPEED:Int = 21
+
+Const SCROLLBAR_LEFT_SIDE:Int = 0
+Const SCROLLBAR_RIGHT_SIDE:Int = 1
+
+Const LIST_ITEMS_HEIGHT:Int = 16
+Const LIST_ITEMS_PADDING:Int = 17
+Const SCROLLBAR_WIDTH:Int = 18
+Const SCROLLBAR_SIDE:Int = 19
+
+Const COLOR_SELECTOR_SIZE:Int = 16
+Const HUEBAR_WIDTH:Int = 17
+Const HUEBAR_PADDING:Int = 18
+Const HUEBAR_SELECTOR_HEIGHT:Int = 19
+Const HUEBAR_SELECTOR_OVERFLOW:Int = 20

+ 2 - 2
gui.mod/gui.bmx

@@ -120,7 +120,7 @@ Rem
 bbdoc: Gets gui custom font (global state).
 End Rem
 Function GuiGetFont:RFont()
-	bmx_raygui_GuiGetFont()
+	Return bmx_raygui_GuiGetFont()
 End Function
 
 ' Style set/get functions
@@ -135,7 +135,7 @@ Rem
 bbdoc: Gets one style property.
 End Rem
 Function GuiGetStyle:Int(control:Int, property:Int)
-	bmx_raygui_GuiGetStyle(control, property)
+	Return bmx_raygui_GuiGetStyle(control, property)
 End Function