TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Return unique_ptr from ui_add_gadget_scrollbar

Browse source
This commit is contained in:
Kp 2014-12-20 04:36:10 +00:00
parent 3b4fbd0bd5
commit 1d363bbd5d
4 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/include/ui.h
View file

@ -191,11 +191,11 @@ struct UI_GADGET_LISTBOX : UI_GADGET
int current_item; int current_item;
int selected_item; int selected_item;
int old_current_item; int old_current_item;
fix64 last_scrolled;
int dragging; int dragging;
int textheight; int textheight;
UI_GADGET_SCROLLBAR * scrollbar;
int moved; int moved;
std::unique_ptr<UI_GADGET_SCROLLBAR> scrollbar;
fix64 last_scrolled;
}; };
enum dialog_flags enum dialog_flags
@ -305,7 +305,7 @@ extern void ui_mega_process();
extern void ui_get_button_size( const char * text, int * width, int * height ); extern void ui_get_button_size( const char * text, int * width, int * height );
extern UI_GADGET_SCROLLBAR * ui_add_gadget_scrollbar( UI_DIALOG * dlg, short x, short y, short w, short h, int start, int stop, int position, int window_size ); std::unique_ptr<UI_GADGET_SCROLLBAR> ui_add_gadget_scrollbar(UI_DIALOG * dlg, short x, short y, short w, short h, int start, int stop, int position, int window_size);
window_event_result ui_scrollbar_do( UI_DIALOG *dlg, UI_GADGET_SCROLLBAR * scrollbar, const d_event &event ); window_event_result ui_scrollbar_do( UI_DIALOG *dlg, UI_GADGET_SCROLLBAR * scrollbar, const d_event &event );
extern void ui_draw_scrollbar( UI_DIALOG *dlg, UI_GADGET_SCROLLBAR * scrollbar ); extern void ui_draw_scrollbar( UI_DIALOG *dlg, UI_GADGET_SCROLLBAR * scrollbar );

2
common/ui/gadget.cpp
View file

@ -99,8 +99,6 @@ void ui_gadget_delete_all( UI_DIALOG * dlg )
delete static_cast<UI_GADGET_LISTBOX *>(tmp); delete static_cast<UI_GADGET_LISTBOX *>(tmp);
break; break;
case UI_GADGET_SCROLLBAR::s_kind: case UI_GADGET_SCROLLBAR::s_kind:
delete static_cast<UI_GADGET_SCROLLBAR *>(tmp);
break;
case UI_GADGET_RADIO::s_kind: case UI_GADGET_RADIO::s_kind:
case UI_GADGET_CHECKBOX::s_kind: case UI_GADGET_CHECKBOX::s_kind:
case UI_GADGET_INPUTBOX::s_kind: case UI_GADGET_INPUTBOX::s_kind:

4
common/ui/listbox.cpp
View file

@ -186,7 +186,7 @@ window_event_result ui_listbox_do( UI_DIALOG *dlg, UI_GADGET_LISTBOX * listbox,c
listbox->old_first_item = listbox->first_item; listbox->old_first_item = listbox->first_item;
if (GADGET_PRESSED(listbox->scrollbar)) if (GADGET_PRESSED(listbox->scrollbar.get()))
{ {
listbox->moved = 1; listbox->moved = 1;
@ -396,7 +396,7 @@ void ui_listbox_change(UI_DIALOG *, UI_GADGET_LISTBOX *listbox, short numitems,
listbox->current_item = listbox->old_current_item = 0; listbox->current_item = listbox->old_current_item = 0;
listbox->moved = 0; listbox->moved = 0;
scrollbar = listbox->scrollbar; scrollbar = listbox->scrollbar.get();
start=0; start=0;
stop= numitems - listbox->num_items_displayed; stop= numitems - listbox->num_items_displayed;

8
common/ui/scroll.cpp
View file

@ -50,7 +50,7 @@ void ui_draw_scrollbar( UI_DIALOG *dlg, UI_GADGET_SCROLLBAR * scrollbar )
ui_draw_box_out(0, scrollbar->fake_position, scrollbar->width-1, scrollbar->fake_position+scrollbar->fake_size-1 ); ui_draw_box_out(0, scrollbar->fake_position, scrollbar->width-1, scrollbar->fake_position+scrollbar->fake_size-1 );
} }
UI_GADGET_SCROLLBAR * ui_add_gadget_scrollbar( UI_DIALOG * dlg, short x, short y, short w, short h, int start, int stop, int position, int window_size ) std::unique_ptr<UI_GADGET_SCROLLBAR> ui_add_gadget_scrollbar(UI_DIALOG * dlg, short x, short y, short w, short h, int start, int stop, int position, int window_size)
{ {
int tw, th, taw; int tw, th, taw;
@ -65,13 +65,13 @@ UI_GADGET_SCROLLBAR * ui_add_gadget_scrollbar( UI_DIALOG * dlg, short x, short y
if (stop < start ) stop = start; if (stop < start ) stop = start;
auto scrollbar = ui_gadget_add<UI_GADGET_SCROLLBAR>( dlg, x, y+w, x+w-1, y+h-w-1 ); std::unique_ptr<UI_GADGET_SCROLLBAR> scrollbar{ui_gadget_add<UI_GADGET_SCROLLBAR>(dlg, x, y+w, x+w-1, y+h-w-1)};
scrollbar->up_button = ui_add_gadget_button( dlg, x, y, w, w, up, NULL ); scrollbar->up_button = ui_add_gadget_button( dlg, x, y, w, w, up, NULL );
scrollbar->up_button->parent = scrollbar; scrollbar->up_button->parent = scrollbar.get();
scrollbar->down_button =ui_add_gadget_button( dlg, x, y+h-w, w, w, down, NULL ); scrollbar->down_button =ui_add_gadget_button( dlg, x, y+h-w, w, w, down, NULL );
scrollbar->down_button->parent = scrollbar; scrollbar->down_button->parent = scrollbar.get();
scrollbar->horz = 0; scrollbar->horz = 0;
scrollbar->width = scrollbar->x2-scrollbar->x1+1; scrollbar->width = scrollbar->x2-scrollbar->x1+1;