Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-03-23 15:35:11 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

#322: remove Fluid's dependency on fltk_forms.

Browse Source
This commit is contained in:
Matthias Melcher
2021-12-13 18:32:11 +01:00
committed by Matthias Melcher
parent e76611a1fe
commit 21c328f0c5
3 changed files with 41 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fluid/CMakeLists.txt
View File

@@ -106,7 +106,7 @@ else ()
add_executable (fluid WIN32 ${CPPFILES} ${HEADERFILES}) add_executable (fluid WIN32 ${CPPFILES} ${HEADERFILES})
endif (APPLE AND (NOT OPTION_APPLE_X11) AND (NOT OPTION_APPLE_SDL)) endif (APPLE AND (NOT OPTION_APPLE_X11) AND (NOT OPTION_APPLE_SDL))
target_link_libraries (fluid fltk fltk_images fltk_forms) target_link_libraries (fluid fltk fltk_images)
if (FLTK_HAVE_CAIRO) if (FLTK_HAVE_CAIRO)
fl_target_link_directories (fluid PRIVATE "${PKG_CAIRO_LIBRARY_DIRS}") fl_target_link_directories (fluid PRIVATE "${PKG_CAIRO_LIBRARY_DIRS}")
endif (FLTK_HAVE_CAIRO) endif (FLTK_HAVE_CAIRO)

2
fluid/Makefile
View File

@@ -60,7 +60,7 @@ all: $(FLUID) fluid$(EXEEXT)
fluid$(EXEEXT): $(OBJECTS) $(LIBNAME) $(FLLIBNAME) \ fluid$(EXEEXT): $(OBJECTS) $(LIBNAME) $(FLLIBNAME) \
$(IMGLIBNAME) $(IMGLIBNAME)
echo Linking $@... echo Linking $@...
$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDFLAGS) $(LDLIBS) $(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKFLTKIMG) $(LDFLAGS) $(LDLIBS)
$(OSX_ONLY) $(RM) -r -f fluid.app $(OSX_ONLY) $(RM) -r -f fluid.app
$(OSX_ONLY) mkdir -p fluid.app/Contents/MacOS fluid.app/Contents/Resources $(OSX_ONLY) mkdir -p fluid.app/Contents/MacOS fluid.app/Contents/Resources
$(OSX_ONLY) $(INSTALL_BIN) fluid fluid.app/Contents/MacOS $(OSX_ONLY) $(INSTALL_BIN) fluid fluid.app/Contents/MacOS

39
fluid/file.cxx
View File

@@ -710,6 +710,45 @@ static const char *class_matcher[] = {
"24","Fl_Value_Slider", "24","Fl_Value_Slider",
0}; 0};
/**
Copied from forms_compatibility.cxx so we don't have to link to fltk_forms.
*/
void Fl_Group::forms_end() {
// set the dimensions of a group to surround contents
if (children() && !w()) {
Fl_Widget*const* a = array();
Fl_Widget* o = *a++;
int rx = o->x();
int ry = o->y();
int rw = rx+o->w();
int rh = ry+o->h();
for (int i=children_-1; i--;) {
o = *a++;
if (o->x() < rx) rx = o->x();
if (o->y() < ry) ry = o->y();
if (o->x()+o->w() > rw) rw = o->x()+o->w();
if (o->y()+o->h() > rh) rh = o->y()+o->h();
}
x(rx);
y(ry);
w(rw-rx);
h(rh-ry);
}
// flip all the children's coordinate systems:
if (fdesign_flip) {
Fl_Widget* o = (type()>=FL_WINDOW) ? this : window();
int Y = o->h();
Fl_Widget*const* a = array();
for (int i=children(); i--;) {
Fl_Widget* ow = *a++;
int newy = Y-ow->y()-ow->h();
ow->y(newy);
}
}
end();
}
/** /**
Read a XForms design file. Read a XForms design file.
.fl and .fd file start with the same header. Fluid can recognize .fd XForms .fl and .fd file start with the same header. Fluid can recognize .fd XForms