notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Step 2 of Merge branch 'master' into sdl2.0

Browse source
This commit is contained in:
Pere Pujal i Carabantes 2022-02-01 00:19:27 +01:00
commit c49d2a6f68
4 changed files with 129 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/tuxpaint.c
View file

@ -22,7 +22,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt)
June 14, 2002 - January 21, 2022
June 14, 2002 - January 25, 2022
*/
#include "platform.h"
@ -3434,29 +3434,19 @@ static void mainloop(void)
{
if (onscreen_keyboard_layout)
kbd =
osk_create(onscreen_keyboard_layout, screen,
osk_create(onscreen_keyboard_layout, canvas,
img_btn_up, img_btn_down, img_btn_off,
img_btn_nav, img_btn_hold,
img_oskdel, img_osktab, img_oskenter,
img_oskcapslock, img_oskshift,
img_btnsm_up, img_btnsm_down, img_btnsm_off,
img_btnsm_nav, img_btnsm_hold,
/* FIXME */
img_oskdel, img_osktab, img_oskenter,
img_oskcapslock, img_oskshift,
onscreen_keyboard_disable_change);
else
kbd =
osk_create(strdup("default.layout"), screen,
osk_create(strdup("default.layout"), canvas,
img_btn_up, img_btn_down, img_btn_off,
img_btn_nav, img_btn_hold,
img_oskdel, img_osktab, img_oskenter,
img_oskcapslock, img_oskshift,
img_btnsm_up, img_btnsm_down, img_btnsm_off,
img_btnsm_nav, img_btnsm_hold,
/* FIXME */
img_oskdel, img_osktab, img_oskenter,
img_oskcapslock, img_oskshift,
onscreen_keyboard_disable_change);
}
if (kbd == NULL)
@ -26343,8 +26333,6 @@ static void setup(void)
img_btn_nav, img_btn_hold,
img_oskdel, img_osktab, img_oskenter,
img_oskcapslock, img_oskshift,
img_btnsm_up, img_btnsm_down, img_btnsm_off, img_btnsm_nav,
img_btnsm_hold, img_oskdel, img_osktab, img_oskenter, img_oskcapslock, img_oskshift,
onscreen_keyboard_disable_change);
}
else
@ -26354,8 +26342,6 @@ img_btnsm_up, img_btnsm_down, img_btnsm_off, img_btnsm_nav,
img_btn_nav, img_btn_hold,
img_oskdel, img_osktab, img_oskenter,
img_oskcapslock, img_oskshift,
img_btnsm_up, img_btnsm_down, img_btnsm_off, img_btnsm_nav,
img_btnsm_hold, img_oskdel, img_osktab, img_oskenter, img_oskcapslock, img_oskshift,
onscreen_keyboard_disable_change);
}
}