Commit graph

294 commits

Author SHA1 Message Date
Filip Sykala
133ce45aeb Fix not rendered style image. e.g. can't load font 2022-03-03 16:26:50 +01:00
Filip Sykala
ad1510a30c Start using string_view in truncate text 2022-03-03 08:13:00 +01:00
Filip Sykala
a0dde4651b Add default value to optional input
Remove unnecessary addiction to canvas3d in imgui wrapper
2022-03-02 14:34:25 +01:00
Filip Sykala
99d3e102c8 Add focus on selected font when open combobox 2022-03-02 11:59:22 +01:00
Filip Sykala
18d269506a add index of font inside of collection to FontProp(font property) + serialization/deserialization (3mf + appConfig)
separate glyph cache from FontFile
2022-02-28 18:32:50 +01:00
Filip Sykala
284fd8ec8b Remove reference in lambda call 2022-02-22 13:39:28 +01:00
Filip Sykala
212544d532 Fix rotation with object 2022-02-22 13:32:01 +01:00
Filip Sykala
f3f2dddcd1 Fix order of filling stored items 2022-02-22 13:13:21 +01:00
Filip Sykala
8f9887acdb Reduce amount of Undo/Redo snapshots 2022-02-22 12:43:29 +01:00
Filip Sykala
6181b166a4 Add warning on to large and to small font which are not used in emboss text input 2022-02-22 09:56:47 +01:00
Filip Sykala
32573178c3 Do not allow undo for not stored style 2022-02-21 21:37:08 +01:00
Filip Sykala
56b5e5edfb Fix detection of changed angle 2022-02-21 16:18:26 +01:00
Filip Sykala
5ffa19b529 Unify place of transformation 2022-02-21 16:12:38 +01:00
Filip Sykala
233ea5e0d8 Store activ font style 2022-02-21 09:00:03 +01:00
Filip Sykala
a8ef5c35d2 Undo changes for input 2022-02-18 12:33:39 +01:00
Filip Sykala
bed5232a22 Using unit per em instead of ascent 2022-02-16 14:57:57 +01:00
Filip Sykala
7208fc571e Add warning line gap is not shown in text box
Imgui not support add line gap to FONT yet
2022-02-16 09:04:13 +01:00
Filip Sykala
84cd85e243 Fix advanced alliment + translation for calc offsets 2022-02-16 08:41:56 +01:00
Filip Sykala
6dd5e21f59 Fix font size
Fix swap style
2022-02-15 09:14:16 +01:00
Filip Sykala
faa33901f2 Fix height 2022-02-11 16:34:26 +01:00
Filip Sykala
05e795bd9e Connect rotation by gizmo with angle inside of property 2022-02-11 15:15:23 +01:00
Filip Sykala
6a62462c7e Translate above/under surface and rotate by Z axis in ImGui 2022-02-11 09:42:38 +01:00
Filip Sykala
faa63f3182 Merge branch 'master' into fs_emboss
# Conflicts:
#	src/libslic3r/Format/3mf.cpp
2022-02-10 14:04:02 +01:00
Filip Sykala
6165583b46 fix 2022-02-09 10:23:51 +01:00
Filip Sykala
92a6067dee Try to move with volume 2022-02-09 10:08:56 +01:00
Filip Sykala
8ea46e422d Fixes:
../src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp:1040:11: warning: add explicit braces to avoid dangling else [-Wdangling-else]
../src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp:1309:19: warning: unused variable 'min_win_size_prev' [-Wunused-variable]
../src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp:1308:12: warning: unused variable 'window_size' [-Wunused-variable]
../src/slic3r/Utils/WxFontUtils.cpp:22:12: error: cannot initialize return object of type 'void *' with an rvalue of type 'const wxNativeFontInfo *'
../src/slic3r/Utils/WxFontUtils.cpp:41:42: error: member access into incomplete type 'const wxNativeFontInfo'
2022-02-03 08:33:00 +01:00
Filip Sykala
a50d93cd66 Merge branch 'master' into fs_emboss
# Conflicts:
#	src/libslic3r/Geometry.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoMove.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoMove.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoScale.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoScale.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
#	src/slic3r/GUI/ImGuiWrapper.cpp
#	src/slic3r/GUI/ImGuiWrapper.hpp
#	src/slic3r/GUI/Selection.cpp
#	tests/slic3rutils/slic3r_jobs_tests.cpp
2022-02-02 15:27:25 +01:00
Filip Sykala
057abce935 update font after bold click 2022-02-02 14:07:52 +01:00
Filip Sykala
1078fe55ec Create text on second Part(volume) of object 2022-02-01 18:31:27 +01:00
Filip Sykala
936ba6c28c Default font inside of gizmo 2022-02-01 08:21:11 +01:00
Filip Sykala
af69a4f2de create emboss text mesh on same place as update
fix:
Un Itelic redraw
../src/slic3r/Utils/WxFontUtils.hpp:49:77: error: non-const lvalue reference to type 'shared_ptr<...>' cannot bind to a temporary of type 'shared_ptr<...>'
../src/slic3r/Utils/WxFontUtils.hpp:55:75: error: non-const lvalue reference to type 'shared_ptr<...>' cannot bind to a temporary of type 'shared_ptr<...>'
2022-01-31 13:17:24 +01:00
Filip Sykala
d10fd37b2f Creation by jobs 2022-01-28 19:33:57 +01:00
Filip Sykala
53ee0092b0 Create emboss object on cursor position 2022-01-28 18:00:10 +01:00
Filip Sykala
ed818f9177 Transformation of text is now allowed only inside object instance 2022-01-27 13:38:52 +01:00
Filip Sykala
137399ef1a Style select with rendered name
Fix negative volume color when dragging
2022-01-27 10:47:05 +01:00
Filip Sykala
d55f09d75b add Enumerate fonts. not Finished 2022-01-21 20:19:06 +01:00
Filip Sykala
770a5c5501 Redesign GUI of emboss 2022-01-20 16:09:48 +01:00
Filip Sykala
83372764ad Fix font index for store to AppConfig 2022-01-14 09:37:11 +01:00
Filip Sykala
4d31128837 Separate font manager to be able manage imgui font for all fonts
Separate FontListSerializable
Rename Emboss::Font to Emboss::FontFile
2022-01-13 22:00:53 +01:00
Filip Sykala
2c3477d3d7 Dynamic skew not only for linux 2022-01-12 09:48:53 +01:00
Filip Sykala
310d53c1b9 Duplicate font item GUI 2022-01-11 14:07:38 +01:00
Filip Sykala
734026bf96 Reorder font list by draging font 2022-01-10 13:30:42 +01:00
Filip Sykala
3e0bc4a529 Only unique name of font item
Add FontListSerializable for store/load font list from AppConfig
2022-01-10 10:59:10 +01:00
Filip Sykala
ef6860d4ee Move font property inside of font item to store together with font 2022-01-07 18:50:57 +01:00
Filip Sykala
5800d21ad6 add skew for linux italic without italic inside font 2022-01-06 16:19:29 +01:00
Filip Sykala
4ec4bafe19 Create Emboss::Font as unique ptr not optional
Reason: Job need pointer on font until finished
2022-01-06 16:12:15 +01:00
Filip Sykala
82ee1c5e4a Add boldness and skew(italic) for embossed text
Change line_gap and char_gap to optional value
2022-01-05 16:56:20 +01:00
Filip Sykala
4e559daece Not use shared raycasters 2022-01-04 15:31:49 +01:00
Filip Sykala
5869f86d97 Initial shape for emboss is not cached any more 2022-01-04 13:21:31 +01:00
Filip Sykala
0a3fc00851 Fix Rename window> size + text 2022-01-03 15:40:24 +01:00