X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fcontrollers%2FControlFloat.C;h=24fe4acdc16f26194063a62bff29716f59cb22f1;hb=b7c9ae49318e0167a46e7213c967280205db4cf6;hp=73a0c01e617de87cf649acf6216245252bca902c;hpb=435d527581277fab8b1aa67888f17d8439d07693;p=lyx.git diff --git a/src/frontends/controllers/ControlFloat.C b/src/frontends/controllers/ControlFloat.C index 73a0c01e61..24fe4acdc1 100644 --- a/src/frontends/controllers/ControlFloat.C +++ b/src/frontends/controllers/ControlFloat.C @@ -1,49 +1,32 @@ -/* This file is part of - * ====================================================== +/** + * \file ControlFloat.C + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * LyX, The Document Processor - * - * Copyright 2001 The LyX Team. - * - * ====================================================== + * \author unknown * + * Full author contact details are available in file CREDITS */ #include -#ifdef __GNUG__ -#pragma implementation -#endif -#include "ViewBase.h" -#include "ButtonControllerBase.h" #include "ControlFloat.h" -#include "ControlInset.tmpl" -#include "Dialogs.h" -#include "frontends/LyXView.h" -#include "buffer.h" #include "BufferView.h" -#include "insets/insetfloat.h" - -using std::vector; -using SigC::slot; +#include "buffer.h" ControlFloat::ControlFloat(LyXView & lv, Dialogs & d) : ControlInset(lv, d) -{ - d_.showFloat.connect(slot(this, &ControlFloat::showInset)); - - // We could have an extra method updateInset that calls - // view().update() rather than view().show(), but I don't see why - // it is really needed. - //d_.updateFloat.connect(slot(this, &ControlFloat::showInset)); -} +{} void ControlFloat::applyParamsToInset() { inset()->placement(params().placement); + inset()->wide(params().wide, bufferview()->buffer()->params); + bufferview()->updateInset(inset(), true); + } @@ -59,11 +42,11 @@ FloatParams const ControlFloat::getParams(InsetFloat const & inset) FloatParams::FloatParams() : placement("htbp"), - allow_here_definitely(true) + wide(false) {} FloatParams::FloatParams(InsetFloat const & inset) : placement(inset.placement()), - allow_here_definitely(!inset.wide()) + wide(inset.wide()) {}