Changeset 1eaead4 in mainline for uspace/app/uidemo/uidemo.c
- Timestamp:
- 2023-02-07T16:11:53Z (15 months ago)
- Branches:
- master, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 0366d09d
- Parents:
- 7c5320c
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/app/uidemo/uidemo.c
r7c5320c r1eaead4 1 1 /* 2 * Copyright (c) 202 2Jiri Svoboda2 * Copyright (c) 2023 Jiri Svoboda 3 3 * All rights reserved. 4 4 * … … 51 51 #include <ui/promptdialog.h> 52 52 #include <ui/resource.h> 53 #include <ui/tab.h> 54 #include <ui/tabset.h> 53 55 #include <ui/ui.h> 54 56 #include <ui/window.h> … … 615 617 params.rect.p0.x = 0; 616 618 params.rect.p0.y = 0; 617 params.rect.p1.x = 4 4;618 params.rect.p1.y = 2 3;619 params.rect.p1.x = 46; 620 params.rect.p1.y = 25; 619 621 } else { 620 622 params.rect.p0.x = 0; 621 623 params.rect.p0.y = 0; 622 params.rect.p1.x = 25 0;623 params.rect.p1.y = 370;624 params.rect.p1.x = 255; 625 params.rect.p1.y = 410; 624 626 } 625 627 … … 743 745 rect.p0.x = 4; 744 746 rect.p0.y = 30; 745 rect.p1.x = 2 16;747 rect.p1.x = 251; 746 748 rect.p1.y = 52; 747 749 } 750 748 751 ui_menu_bar_set_rect(demo.mbar, &rect); 749 752 … … 754 757 } 755 758 759 rc = ui_tab_set_create(ui_res, &demo.tabset); 760 if (rc != EOK) { 761 printf("Error creating tab set.\n"); 762 return rc; 763 } 764 765 /* FIXME: Auto layout */ 766 if (ui_is_textmode(ui)) { 767 rect.p0.x = 2; 768 rect.p0.y = 2; 769 rect.p1.x = 44; 770 rect.p1.y = 24; 771 } else { 772 rect.p0.x = 8; 773 rect.p0.y = 53; 774 rect.p1.x = 250; 775 rect.p1.y = 405; 776 } 777 778 ui_tab_set_set_rect(demo.tabset, &rect); 779 780 rc = ui_tab_create(demo.tabset, "Basic", &demo.tbasic); 781 if (rc != EOK) { 782 printf("Error creating tab.\n"); 783 return rc; 784 } 785 786 rc = ui_tab_create(demo.tabset, "Lists", &demo.tlists); 787 if (rc != EOK) { 788 printf("Error creating tab.\n"); 789 return rc; 790 } 791 792 rc = ui_fixed_add(demo.fixed, ui_tab_set_ctl(demo.tabset)); 793 if (rc != EOK) { 794 printf("Error adding control to layout.\n"); 795 return rc; 796 } 797 798 rc = ui_fixed_create(&demo.bfixed); 799 if (rc != EOK) { 800 printf("Error creating fixed layout.\n"); 801 return rc; 802 } 803 756 804 rc = ui_entry_create(window, "", &demo.entry); 757 805 if (rc != EOK) { … … 762 810 /* FIXME: Auto layout */ 763 811 if (ui_is_textmode(ui)) { 764 rect.p0.x = 2;765 rect.p0.y = 3;766 rect.p1.x = 39;767 rect.p1.y = 4;812 rect.p0.x = 4; 813 rect.p0.y = 5; 814 rect.p1.x = 41; 815 rect.p1.y = 6; 768 816 } else { 769 817 rect.p0.x = 15; 770 rect.p0.y = 53;818 rect.p0.y = 88; 771 819 rect.p1.x = 205; 772 rect.p1.y = 78;820 rect.p1.y = 113; 773 821 } 774 822 … … 776 824 ui_entry_set_halign(demo.entry, gfx_halign_center); 777 825 778 rc = ui_fixed_add(demo. fixed, ui_entry_ctl(demo.entry));826 rc = ui_fixed_add(demo.bfixed, ui_entry_ctl(demo.entry)); 779 827 if (rc != EOK) { 780 828 printf("Error adding control to layout.\n"); … … 790 838 /* FIXME: Auto layout */ 791 839 if (ui_is_textmode(ui)) { 792 rect.p0.x = 2;793 rect.p0.y = 5;794 rect.p1.x = 4 2;795 rect.p1.y = 6;840 rect.p0.x = 4; 841 rect.p0.y = 7; 842 rect.p1.x = 41; 843 rect.p1.y = 8; 796 844 } else { 797 845 rect.p0.x = 60; 798 rect.p0.y = 88;846 rect.p0.y = 123; 799 847 rect.p1.x = 160; 800 rect.p1.y = 1 01;848 rect.p1.y = 136; 801 849 } 802 850 … … 804 852 ui_label_set_halign(demo.label, gfx_halign_center); 805 853 806 rc = ui_fixed_add(demo. fixed, ui_label_ctl(demo.label));854 rc = ui_fixed_add(demo.bfixed, ui_label_ctl(demo.label)); 807 855 if (rc != EOK) { 808 856 printf("Error adding control to layout.\n"); … … 820 868 /* FIXME: Auto layout */ 821 869 if (ui_is_textmode(ui)) { 822 rect.p0.x = 2;823 rect.p0.y = 7;824 rect.p1.x = 1 2;825 rect.p1.y = 8;870 rect.p0.x = 4; 871 rect.p0.y = 9; 872 rect.p1.x = 15; 873 rect.p1.y = 10; 826 874 } else { 827 875 rect.p0.x = 15; 828 rect.p0.y = 1 11;876 rect.p0.y = 146; 829 877 rect.p1.x = 105; 830 rect.p1.y = 1 39;878 rect.p1.y = 174; 831 879 } 832 880 … … 835 883 ui_pbutton_set_default(demo.pb1, true); 836 884 837 rc = ui_fixed_add(demo. fixed, ui_pbutton_ctl(demo.pb1));885 rc = ui_fixed_add(demo.bfixed, ui_pbutton_ctl(demo.pb1)); 838 886 if (rc != EOK) { 839 887 printf("Error adding control to layout.\n"); … … 850 898 851 899 if (ui_is_textmode(ui)) { 852 rect.p0.x = 29;853 rect.p0.y = 7;854 rect.p1.x = 39;855 rect.p1.y = 8;900 rect.p0.x = 30; 901 rect.p0.y = 9; 902 rect.p1.x = 41; 903 rect.p1.y = 10; 856 904 } else { 857 905 rect.p0.x = 115; 858 rect.p0.y = 1 11;906 rect.p0.y = 146; 859 907 rect.p1.x = 205; 860 rect.p1.y = 1 39;908 rect.p1.y = 174; 861 909 } 862 910 863 911 ui_pbutton_set_rect(demo.pb2, &rect); 864 912 865 rc = ui_fixed_add(demo. fixed, ui_pbutton_ctl(demo.pb2));913 rc = ui_fixed_add(demo.bfixed, ui_pbutton_ctl(demo.pb2)); 866 914 if (rc != EOK) { 867 915 printf("Error adding control to layout.\n"); … … 897 945 898 946 if (ui_is_textmode(ui)) { 899 off.x = 2;900 off.y = 9;947 off.x = 4; 948 off.y = 11; 901 949 } else { 902 950 off.x = 15; 903 off.y = 1 55;951 off.y = 190; 904 952 } 905 953 … … 915 963 ui_image_set_rect(demo.image, &rect); 916 964 917 rc = ui_fixed_add(demo. fixed, ui_image_ctl(demo.image));965 rc = ui_fixed_add(demo.bfixed, ui_image_ctl(demo.image)); 918 966 if (rc != EOK) { 919 967 printf("Error adding control to layout.\n"); … … 931 979 /* FIXME: Auto layout */ 932 980 if (ui_is_textmode(ui)) { 933 rect.p0.x = 2;934 rect.p0.y = 1 2;935 rect.p1.x = 1 2;936 rect.p1.y = 1 3;981 rect.p0.x = 4; 982 rect.p0.y = 14; 983 rect.p1.x = 14; 984 rect.p1.y = 15; 937 985 } else { 938 986 rect.p0.x = 15; 939 rect.p0.y = 190;987 rect.p0.y = 225; 940 988 rect.p1.x = 140; 941 rect.p1.y = 2 10;989 rect.p1.y = 245; 942 990 } 943 991 944 992 ui_checkbox_set_rect(demo.checkbox, &rect); 945 993 946 rc = ui_fixed_add(demo. fixed, ui_checkbox_ctl(demo.checkbox));994 rc = ui_fixed_add(demo.bfixed, ui_checkbox_ctl(demo.checkbox)); 947 995 if (rc != EOK) { 948 996 printf("Error adding control to layout.\n"); … … 968 1016 /* FIXME: Auto layout */ 969 1017 if (ui_is_textmode(ui)) { 970 rect.p0.x = 2;971 rect.p0.y = 1 4;972 rect.p1.x = 1 2;973 rect.p1.y = 1 5;1018 rect.p0.x = 4; 1019 rect.p0.y = 16; 1020 rect.p1.x = 14; 1021 rect.p1.y = 17; 974 1022 } else { 975 1023 rect.p0.x = 15; 976 rect.p0.y = 2 20;1024 rect.p0.y = 255; 977 1025 rect.p1.x = 140; 978 rect.p1.y = 2 40;1026 rect.p1.y = 275; 979 1027 } 980 1028 ui_rbutton_set_rect(demo.rbleft, &rect); 981 1029 982 rc = ui_fixed_add(demo. fixed, ui_rbutton_ctl(demo.rbleft));1030 rc = ui_fixed_add(demo.bfixed, ui_rbutton_ctl(demo.rbleft)); 983 1031 if (rc != EOK) { 984 1032 printf("Error adding control to layout.\n"); … … 995 1043 /* FIXME: Auto layout */ 996 1044 if (ui_is_textmode(ui)) { 997 rect.p0.x = 2;998 rect.p0.y = 1 5;999 rect.p1.x = 1 2;1000 rect.p1.y = 1 6;1045 rect.p0.x = 4; 1046 rect.p0.y = 17; 1047 rect.p1.x = 14; 1048 rect.p1.y = 18; 1001 1049 } else { 1002 1050 rect.p0.x = 15; 1003 rect.p0.y = 2 50;1051 rect.p0.y = 285; 1004 1052 rect.p1.x = 140; 1005 rect.p1.y = 270;1053 rect.p1.y = 305; 1006 1054 } 1007 1055 ui_rbutton_set_rect(demo.rbcenter, &rect); 1008 1056 ui_rbutton_select(demo.rbcenter); 1009 1057 1010 rc = ui_fixed_add(demo. fixed, ui_rbutton_ctl(demo.rbcenter));1058 rc = ui_fixed_add(demo.bfixed, ui_rbutton_ctl(demo.rbcenter)); 1011 1059 if (rc != EOK) { 1012 1060 printf("Error adding control to layout.\n"); … … 1023 1071 /* FIXME: Auto layout */ 1024 1072 if (ui_is_textmode(ui)) { 1025 rect.p0.x = 2;1026 rect.p0.y = 1 6;1027 rect.p1.x = 1 2;1028 rect.p1.y = 1 7;1073 rect.p0.x = 4; 1074 rect.p0.y = 18; 1075 rect.p1.x = 14; 1076 rect.p1.y = 19; 1029 1077 } else { 1030 1078 rect.p0.x = 15; 1031 rect.p0.y = 280;1079 rect.p0.y = 315; 1032 1080 rect.p1.x = 140; 1033 rect.p1.y = 3 00;1081 rect.p1.y = 335; 1034 1082 } 1035 1083 ui_rbutton_set_rect(demo.rbright, &rect); 1036 1084 1037 rc = ui_fixed_add(demo. fixed, ui_rbutton_ctl(demo.rbright));1085 rc = ui_fixed_add(demo.bfixed, ui_rbutton_ctl(demo.rbright)); 1038 1086 if (rc != EOK) { 1039 1087 printf("Error adding control to layout.\n"); … … 1051 1099 /* FIXME: Auto layout */ 1052 1100 if (ui_is_textmode(ui)) { 1053 rect.p0.x = 2;1054 rect.p0.y = 18;1055 rect.p1.x = 28;1056 rect.p1.y = 19;1101 rect.p0.x = 4; 1102 rect.p0.y = 20; 1103 rect.p1.x = 32; 1104 rect.p1.y = 21; 1057 1105 } else { 1058 1106 rect.p0.x = 15; 1059 rect.p0.y = 3 10;1107 rect.p0.y = 345; 1060 1108 rect.p1.x = 130; 1061 rect.p1.y = 3 30;1109 rect.p1.y = 365; 1062 1110 } 1063 1111 1064 1112 ui_slider_set_rect(demo.slider, &rect); 1065 1113 1066 rc = ui_fixed_add(demo. fixed, ui_slider_ctl(demo.slider));1114 rc = ui_fixed_add(demo.bfixed, ui_slider_ctl(demo.slider)); 1067 1115 if (rc != EOK) { 1068 1116 printf("Error adding control to layout.\n"); … … 1080 1128 /* FIXME: Auto layout */ 1081 1129 if (ui_is_textmode(ui)) { 1082 rect.p0.x = 2;1083 rect.p0.y = 2 0;1084 rect.p1.x = 4 0;1085 rect.p1.y = 2 1;1130 rect.p0.x = 4; 1131 rect.p0.y = 22; 1132 rect.p1.x = 42; 1133 rect.p1.y = 23; 1086 1134 } else { 1087 1135 rect.p0.x = 15; 1088 rect.p0.y = 3 40;1136 rect.p0.y = 375; 1089 1137 rect.p1.x = 220; 1090 rect.p1.y = 3 63;1138 rect.p1.y = 398; 1091 1139 } 1092 1140 … … 1096 1144 ui_scrollbar_through_length(demo.hscrollbar) / 4); 1097 1145 1098 rc = ui_fixed_add(demo. fixed, ui_scrollbar_ctl(demo.hscrollbar));1146 rc = ui_fixed_add(demo.bfixed, ui_scrollbar_ctl(demo.hscrollbar)); 1099 1147 if (rc != EOK) { 1100 1148 printf("Error adding control to layout.\n"); … … 1112 1160 /* FIXME: Auto layout */ 1113 1161 if (ui_is_textmode(ui)) { 1114 rect.p0.x = 4 0;1115 rect.p0.y = 3;1116 rect.p1.x = 4 1;1117 rect.p1.y = 2 0;1162 rect.p0.x = 42; 1163 rect.p0.y = 5; 1164 rect.p1.x = 43; 1165 rect.p1.y = 22; 1118 1166 } else { 1119 1167 rect.p0.x = 220; 1120 rect.p0.y = 53;1168 rect.p0.y = 88; 1121 1169 rect.p1.x = 243; 1122 rect.p1.y = 3 40;1170 rect.p1.y = 375; 1123 1171 } 1124 1172 … … 1128 1176 ui_scrollbar_through_length(demo.vscrollbar) / 4); 1129 1177 1130 rc = ui_fixed_add(demo.fixed, ui_scrollbar_ctl(demo.vscrollbar)); 1131 if (rc != EOK) { 1132 printf("Error adding control to layout.\n"); 1133 return rc; 1134 } 1178 rc = ui_fixed_add(demo.bfixed, ui_scrollbar_ctl(demo.vscrollbar)); 1179 if (rc != EOK) { 1180 printf("Error adding control to layout.\n"); 1181 return rc; 1182 } 1183 1184 ui_tab_add(demo.tbasic, ui_fixed_ctl(demo.bfixed)); 1135 1185 1136 1186 ui_window_add(window, ui_fixed_ctl(demo.fixed));
Note:
See TracChangeset
for help on using the changeset viewer.