@@ -42,14 +42,17 @@ class UIListener;
4242
4343class Widget {
4444public :
45- Widget () : x( 0 ),y( 0 ),w( 0 ),h( 0 ) {}
46- Widget (int x, int y) : x(x),y(y) {}
47- Widget (int x, int y, int w, int h) : x(x),y(y),w(w),h(h) {}
48- void setPos (int x , int y ) { this -> x =x; this -> y =y ;}
49- void setSize (int w , int h ) { this -> w =w; this -> h =h ;}
45+ Widget () = default ;
46+ Widget (int x, int y) : x{x},y{y} {}
47+ Widget (int x, int y, int w, int h) : x{x},y{y},w{w},h{h} {}
48+ void setPos (int new_x , int new_y ) { x=new_x;y=new_y ;}
49+ void setSize (int new_w , int new_h ) { w=new_w;h=new_h ;}
5050 void addListener (UIListener *listener) { listeners.push (listener); }
5151 void removeListener (UIListener *listener) { listeners.removeFast (listener); }
52- int x,y,w,h;
52+ int x{0 };
53+ int y{0 };
54+ int w{0 };
55+ int h{0 };
5356protected :
5457 TCODList<UIListener *> listeners;
5558 void sendEvent (EWidgetEvent event);
@@ -123,8 +126,8 @@ protected :
123126class Dialog : public UmbraWidget {
124127public :
125128 Dialog () : flags(0 ),isMinimized(false ),waitRelease(false ) {}
126- void keyboard (TCOD_key_t &key ) { this ->key =key ; UmbraWidget::keyboard (key ); }
127- void mouse (TCOD_mouse_t &ms ) { this ->ms =ms ; UmbraWidget::mouse (ms); }
129+ void keyboard (TCOD_key_t &key_event ) { this ->key =key_event ; UmbraWidget::keyboard (key_event ); }
130+ void mouse (TCOD_mouse_t &ms_event ) { this ->ms =ms_event ; UmbraWidget::mouse (ms); }
128131 bool update (void );
129132 virtual bool update (float elapsed, TCOD_key_t &k, TCOD_mouse_t &mouse) = 0;
130133 void setMaximized ();
0 commit comments